diff --git a/lib/libesp32/berry/default/be_modtab.c b/lib/libesp32/berry/default/be_modtab.c
index 3a7cfc11c..fd98159ec 100644
--- a/lib/libesp32/berry/default/be_modtab.c
+++ b/lib/libesp32/berry/default/be_modtab.c
@@ -145,6 +145,7 @@ BERRY_LOCAL const bntvmodule* const be_module_table[] = {
 
 #ifdef ESP32
 extern void be_load_tasmota_ntvlib(bvm *vm);
+extern void be_load_tasmota_log_reader_class(bvm *vm);
 extern void be_load_light_state_class(bvm *vm);
 extern void be_load_wirelib(bvm *vm);
 extern void be_load_onewirelib(bvm *vm);
@@ -193,6 +194,7 @@ BERRY_API void be_load_custom_libs(bvm *vm)
 #endif
     be_load_Timer_class(vm);
     be_load_tasmota_ntvlib(vm);
+    be_load_tasmota_log_reader_class(vm);
     be_load_Driver_class(vm);
     be_load_md5_lib(vm);
     be_load_serial_lib(vm);
diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h
index 42529fa92..3f78caf90 100644
--- a/lib/libesp32/berry/generate/be_const_strtab.h
+++ b/lib/libesp32/berry/generate/be_const_strtab.h
@@ -232,6 +232,7 @@ extern const bcstring be_const_str_allocated;
 extern const bcstring be_const_str_alternate;
 extern const bcstring be_const_str_animate;
 extern const bcstring be_const_str_animators;
+extern const bcstring be_const_str_arc_dsc;
 extern const bcstring be_const_str_arch;
 extern const bcstring be_const_str_area;
 extern const bcstring be_const_str_arg;
@@ -350,6 +351,9 @@ extern const bcstring be_const_str_display;
 extern const bcstring be_const_str_display_X2Eini;
 extern const bcstring be_const_str_do;
 extern const bcstring be_const_str_draw_arc;
+extern const bcstring be_const_str_draw_arc_dsc;
+extern const bcstring be_const_str_draw_arc_dsc_init;
+extern const bcstring be_const_str_draw_ctx;
 extern const bcstring be_const_str_draw_line;
 extern const bcstring be_const_str_draw_line_dsc;
 extern const bcstring be_const_str_draw_line_dsc_init;
@@ -393,6 +397,7 @@ extern const bcstring be_const_str_find_op;
 extern const bcstring be_const_str_finish;
 extern const bcstring be_const_str_floor;
 extern const bcstring be_const_str_flush;
+extern const bcstring be_const_str_font_embedded;
 extern const bcstring be_const_str_font_montserrat;
 extern const bcstring be_const_str_font_seg7;
 extern const bcstring be_const_str_for;
@@ -424,6 +429,7 @@ extern const bcstring be_const_str_get_free_heap;
 extern const bcstring be_const_str_get_height;
 extern const bcstring be_const_str_get_input_power_status;
 extern const bcstring be_const_str_get_light;
+extern const bcstring be_const_str_get_log;
 extern const bcstring be_const_str_get_object_from_ptr;
 extern const bcstring be_const_str_get_option;
 extern const bcstring be_const_str_get_percentage;
@@ -462,6 +468,7 @@ extern const bcstring be_const_str_imax;
 extern const bcstring be_const_str_imin;
 extern const bcstring be_const_str_import;
 extern const bcstring be_const_str_init;
+extern const bcstring be_const_str_init_draw_arc_dsc;
 extern const bcstring be_const_str_init_draw_line_dsc;
 extern const bcstring be_const_str_input;
 extern const bcstring be_const_str_ins_goto;
@@ -638,6 +645,7 @@ extern const bcstring be_const_str_reverse_gamma10;
 extern const bcstring be_const_str_rotate;
 extern const bcstring be_const_str_round_end;
 extern const bcstring be_const_str_round_start;
+extern const bcstring be_const_str_rounded;
 extern const bcstring be_const_str_rtc;
 extern const bcstring be_const_str_rule;
 extern const bcstring be_const_str_run;
@@ -734,6 +742,7 @@ extern const bcstring be_const_str_target_search;
 extern const bcstring be_const_str_tasmota;
 extern const bcstring be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29;
 extern const bcstring be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29;
+extern const bcstring be_const_str_tasmota_log_reader;
 extern const bcstring be_const_str_tcpclient;
 extern const bcstring be_const_str_tele;
 extern const bcstring be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function;
diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h
index f0712889a..b26de1f17 100644
--- a/lib/libesp32/berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/berry/generate/be_const_strtab_def.h
@@ -1,742 +1,751 @@
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_ins_goto);
-be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_int);
-be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str__X2Ebec);
-be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, NULL);
-be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_round_start);
-be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_display_X2Eini);
-be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str__X2E);
-be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_ceil);
-be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_do);
-be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_AES_GCM);
-be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj);
-be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_geti);
-be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__ptr);
-be_define_const_str(_X2508x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2508x, "%08x-%04x-%04x-%04x-%04x%08x", 1670063141u, 0, 28, &be_const_str_day);
-be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, NULL);
-be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str__X2F);
-be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str__X3C_X3D);
-be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_super);
-be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_get_bri);
-be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_create_custom_widget);
-be_define_const_str(_X2C_X22AXP192_X22_X3A_X7B_X22VBusVoltage_X22_X3A_X25_X2E3f_X2C_X22VBusCurrent_X22_X3A_X25_X2E1f_X2C_X22BattVoltage_X22_X3A_X25_X2E3f_X2C_X22BattCurrent_X22_X3A_X25_X2E1f_X2C_X22Temperature_X22_X3A_X25_X2E1f_X7D, ",\"AXP192\":{\"VBusVoltage\":%.3f,\"VBusCurrent\":%.1f,\"BattVoltage\":%.3f,\"BattCurrent\":%.1f,\"Temperature\":%.1f}", 2598755376u, 0, 106, &be_const_str_get_warning_level);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_rtc);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str__X2Ep);
+be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_CT);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_publish);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_asstring);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_lvgl_event_dispatch);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str__X5B);
+be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_begin_multicast);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__error);
+be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str__X3D_X3C_X3E_X21);
+be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str_BUTTON_CONFIGURATION);
+be_define_const_str(_X2508x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2508x, "%08x-%04x-%04x-%04x-%04x%08x", 1670063141u, 0, 28, &be_const_str_lv_coord_arr);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_RES_OK);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_gamma);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str__X2Fac);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_read24);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_make_cb);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson);
+be_define_const_str(_X2C_X22AXP192_X22_X3A_X7B_X22VBusVoltage_X22_X3A_X25_X2E3f_X2C_X22VBusCurrent_X22_X3A_X25_X2E1f_X2C_X22BattVoltage_X22_X3A_X25_X2E3f_X2C_X22BattCurrent_X22_X3A_X25_X2E1f_X2C_X22Temperature_X22_X3A_X25_X2E1f_X7D, ",\"AXP192\":{\"VBusVoltage\":%.3f,\"VBusCurrent\":%.1f,\"BattVoltage\":%.3f,\"BattCurrent\":%.1f,\"Temperature\":%.1f}", 2598755376u, 0, 106, &be_const_str_bus);
 be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, NULL);
-be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_bool);
-be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_lv_solidified);
-be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29);
-be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback);
-be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str__X3Clambda_X3E);
-be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_lv_signal_bars);
-be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_pow);
-be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, NULL);
-be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_introspect);
-be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_read32);
-be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_set_height);
-be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20);
-be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E);
-be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_codedump);
-be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, NULL);
-be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_compile);
-be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_strptime);
-be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str__anonymous_);
-be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "</form></p>", 3546571739u, 0, 11, NULL);
-be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "</select><p></p>", 1863865923u, 0, 16, &be_const_str_AudioOutput);
-be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3EAuto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "<button name='reapply' class='button bgrn'>Re-apply current configuration</button>", 3147934216u, 0, 82, &be_const_str_b);
-be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "<button name='zipapply' class='button bgrn'>Apply configuration</button>", 1205771629u, 0, 72, &be_const_str_gpio);
-be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "<fieldset><style>.bdis{background:#888;}.bdis:hover{background:#888;}</style>", 842307168u, 0, 77, &be_const_str__begin_transmission);
-be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "<instance: %s(%s, %s, %s)", 257363333u, 0, 25, &be_const_str_clear_first_time);
-be_define_const_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, "<label>Choose a device configuration:</label><br>", 1336654704u, 0, 49, &be_const_str_lv);
-be_define_const_str(_X3Clambda_X3E, "<lambda>", 607256038u, 0, 8, &be_const_str_energy_struct);
-be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='Autoconfiguration'>&nbsp;Current auto-configuration</b></legend>", 4212500780u, 0, 82, &be_const_str_set_rate);
-be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='New autoconf'>&nbsp;Select new auto-configuration</b></legend>", 1926223891u, 0, 80, &be_const_str_get_percentage);
-be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "<option value='%s'>%s</option>", 510303524u, 0, 30, &be_const_str_false);
-be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "<option value='reset'>&lt;Remove autoconf&gt;</option>", 3994619755u, 0, 54, &be_const_str_set_timer);
-be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "<p style='width:340px;'><b>Exception:</b><br>'%s'<br>%s</p>", 4252565082u, 0, 59, &be_const_str_remove_driver);
-be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "<p></p></fieldset><p></p>", 2052843416u, 0, 25, NULL);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3EAuto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "<p><form id=ac action='ac' style='display: block;' method='get'><button>Auto-configuration</button></form></p>", 2058443583u, 0, 110, &be_const_str_HTTP_GET);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=reapply style='display: block;' action='/ac' method='post' ", 546993478u, 0, 71, &be_const_str_area);
-be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=zip style='display: block;' action='/ac' method='post' ", 4033622166u, 0, 67, &be_const_str_sin);
-be_define_const_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, "<p><small>&nbsp;(This feature requires an internet connection)</small></p>", 2719266486u, 0, 74, &be_const_str_get_object_from_ptr);
-be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "<p>Current configuration: </p><p><b>%s</b></p>", 4115655761u, 0, 46, &be_const_str_None);
-be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "<select name='zip'>", 4247924536u, 0, 19, NULL);
-be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s);
-be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str__X5D);
-be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str_shared_key);
-be_define_const_str(_X3E, ">", 990687777u, 0, 1, &be_const_str_sys);
-be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, &be_const_str_AXP192);
-be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_button_pressed);
-be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_RGBW);
-be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, NULL);
-be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_attrdump);
-be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str_GET);
-be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_pop);
-be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_add_header);
-be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_check_privileged_access);
-be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str__class);
-be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, NULL);
-be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, &be_const_str__filename);
-be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29);
-be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_tag);
-be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str__buffer);
-be_define_const_str(BRY_X3A_X20argument_X20must_X20be_X20a_X20function, "BRY: argument must be a function", 3917068408u, 0, 32, &be_const_str_exec_cmd);
-be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, &be_const_str_connected);
-be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_gen_cb);
-be_define_const_str(BRY_X3A_X20method_X20not_X20allowed_X2C_X20use_X20a_X20closure_X20like_X20_X27_X2F_X20args_X20_X2D_X3E_X20obj_X2Efunc_X28args_X29_X27, "BRY: method not allowed, use a closure like '/ args -> obj.func(args)'", 177121572u, 0, 70, &be_const_str_rad);
-be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_set_exten);
-be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_arg_size);
-be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_cb);
-be_define_const_str(CFG_X3A_X20No_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: No '*.autoconf' file found", 755798501u, 0, 31, &be_const_str_set_rgb);
-be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str_tanh);
-be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_redirect);
-be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_signal_arcs);
-be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded  ", 3710273538u, 0, 13, &be_const_str_gc);
-be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, &be_const_str_consume_mono);
-be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, &be_const_str_exp);
-be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, NULL);
-be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, &be_const_str_RGB);
-be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran  ", 3579570472u, 0, 10, &be_const_str_register_obj);
-be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_SERIAL_7O1);
-be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_battery_present);
-be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str_get_power);
-be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_asstring);
+be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_search);
+be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str_SERIAL_7O1);
+be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_value);
+be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_Tasmota);
+be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_floor);
+be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_fast_loop_enabled);
+be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj);
+be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_scan);
+be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_add_header);
+be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, NULL);
+be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str__archive);
+be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str__X2F);
+be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_widget_constructor);
+be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_setrange);
+be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_classname);
+be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_get_size);
+be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_argument_X20must_X20be_X20a_X20function);
+be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "</form></p>", 3546571739u, 0, 11, &be_const_str_set_style_bg_color);
+be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "</select><p></p>", 1863865923u, 0, 16, NULL);
+be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, NULL);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "<button name='reapply' class='button bgrn'>Re-apply current configuration</button>", 3147934216u, 0, 82, &be_const_str_assert);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "<button name='zipapply' class='button bgrn'>Apply configuration</button>", 1205771629u, 0, 72, &be_const_str_set_useragent);
+be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "<fieldset><style>.bdis{background:#888;}.bdis:hover{background:#888;}</style>", 842307168u, 0, 77, NULL);
+be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "<instance: %s(%s, %s, %s)", 257363333u, 0, 25, &be_const_str_AXP192);
+be_define_const_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, "<label>Choose a device configuration:</label><br>", 1336654704u, 0, 49, &be_const_str_lv_obj_class);
+be_define_const_str(_X3Clambda_X3E, "<lambda>", 607256038u, 0, 8, NULL);
+be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='Autoconfiguration'>&nbsp;Current auto-configuration</b></legend>", 4212500780u, 0, 82, &be_const_str_COLOR_BLACK);
+be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='New autoconf'>&nbsp;Select new auto-configuration</b></legend>", 1926223891u, 0, 80, &be_const_str_SERIAL_6E1);
+be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "<option value='%s'>%s</option>", 510303524u, 0, 30, &be_const_str_SERIAL_7O2);
+be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "<option value='reset'>&lt;Remove autoconf&gt;</option>", 3994619755u, 0, 54, NULL);
+be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "<p style='width:340px;'><b>Exception:</b><br>'%s'<br>%s</p>", 4252565082u, 0, 59, &be_const_str_write8);
+be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "<p></p></fieldset><p></p>", 2052843416u, 0, 25, &be_const_str_EC_C25519);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3EAuto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "<p><form id=ac action='ac' style='display: block;' method='get'><button>Auto-configuration</button></form></p>", 2058443583u, 0, 110, NULL);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=reapply style='display: block;' action='/ac' method='post' ", 546993478u, 0, 71, &be_const_str_add_event_cb);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=zip style='display: block;' action='/ac' method='post' ", 4033622166u, 0, 67, &be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27);
+be_define_const_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, "<p><small>&nbsp;(This feature requires an internet connection)</small></p>", 2719266486u, 0, 74, &be_const_str_before_del);
+be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "<p>Current configuration: </p><p><b>%s</b></p>", 4115655761u, 0, 46, &be_const_str_Wire);
+be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "<select name='zip'>", 4247924536u, 0, 19, &be_const_str_SERIAL_7N1);
+be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_lv);
+be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str_signal_arcs);
+be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str__energy);
+be_define_const_str(_X3E, ">", 990687777u, 0, 1, &be_const_str_publish_result);
+be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, &be_const_str_get_coords);
+be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_PART_MAIN);
+be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_battery_present);
+be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032);
+be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, NULL);
+be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str_exists);
+be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_due);
+be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_point_arr);
+be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_draw_ctx);
+be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_pow);
+be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, &be_const_str_if);
+be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27);
+be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback);
+be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_SERIAL_6N2);
+be_define_const_str(BRY_X3A_X20argument_X20must_X20be_X20a_X20function, "BRY: argument must be a function", 3917068408u, 0, 32, &be_const_str_Tele);
+be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, NULL);
+be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_hex);
+be_define_const_str(BRY_X3A_X20method_X20not_X20allowed_X2C_X20use_X20a_X20closure_X20like_X20_X27_X2F_X20args_X20_X2D_X3E_X20obj_X2Efunc_X28args_X29_X27, "BRY: method not allowed, use a closure like '/ args -> obj.func(args)'", 177121572u, 0, 70, &be_const_str_EVENT_DRAW_PART_END);
+be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, NULL);
+be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_get_cb_list);
+be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_INTERNAL_PDM);
+be_define_const_str(CFG_X3A_X20No_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: No '*.autoconf' file found", 755798501u, 0, 31, &be_const_str_w);
+be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str___lower__);
+be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_argument_X20must_X20be_X20a_X20list);
+be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_false);
+be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded  ", 3710273538u, 0, 13, &be_const_str_EVENT_DELETE);
+be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, NULL);
+be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, &be_const_str_lv_signal_arcs);
+be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_chars_in_string);
+be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, &be_const_str_eth);
+be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran  ", 3579570472u, 0, 10, &be_const_str_read8);
+be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_add_anim);
+be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_content_flush);
+be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str__lvgl);
+be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_OPTION_A);
 be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, NULL);
-be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, &be_const_str_lv_wifi_arcs);
-be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, &be_const_str__dirty);
-be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str_EVENT_DRAW_PART_BEGIN);
-be_define_const_str(CT, "CT", 1792671826u, 0, 2, &be_const_str_lv_point);
-be_define_const_str(DIMMER, "DIMMER", 4049308363u, 0, 6, &be_const_str_ctypes_bytes);
-be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_POST);
-be_define_const_str(EVENT_DELETE, "EVENT_DELETE", 282828603u, 0, 12, &be_const_str_remove);
-be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_False);
-be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str_bus);
-be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, NULL);
-be_define_const_str(EXTERNAL_I2S, "EXTERNAL_I2S", 4067456169u, 0, 12, &be_const_str_SERIAL_6O2);
-be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_begin_multicast);
-be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_memory);
-be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str__cmd);
-be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, &be_const_str_cmd);
-be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str__settings_ptr);
-be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_get_coords);
-be_define_const_str(INTERNAL_DAC, "INTERNAL_DAC", 1097623719u, 0, 12, &be_const_str_str);
-be_define_const_str(INTERNAL_PDM, "INTERNAL_PDM", 3043685628u, 0, 12, NULL);
-be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, NULL);
-be_define_const_str(LVG_X3A_X20object_X3A, "LVG: object:", 3824079937u, 0, 12, &be_const_str_OneWire);
-be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_SERIAL_5E1);
-be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, &be_const_str_digital_read);
-be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_get_size);
-be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, NULL);
-be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_from_to);
-be_define_const_str(OpusDecoder, "OpusDecoder", 3618742074u, 0, 11, &be_const_str_get_free_heap);
-be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str__lvgl);
-be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_SERIAL_5O1);
-be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, &be_const_str_width);
-be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str__available);
-be_define_const_str(RGB, "RGB", 3386082140u, 0, 3, &be_const_str_draw_arc);
-be_define_const_str(RGBCT, "RGBCT", 8076251u, 0, 5, &be_const_str_tostring);
-be_define_const_str(RGBW, "RGBW", 3270986321u, 0, 4, &be_const_str_call);
-be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, NULL);
-be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_get_bat_voltage);
-be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str__global_addr);
-be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, NULL);
-be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_content_button);
+be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, NULL);
+be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, NULL);
+be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str_widget_dtor_cb);
+be_define_const_str(CT, "CT", 1792671826u, 0, 2, NULL);
+be_define_const_str(DIMMER, "DIMMER", 4049308363u, 0, 6, NULL);
+be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29);
+be_define_const_str(EVENT_DELETE, "EVENT_DELETE", 282828603u, 0, 12, &be_const_str_bool);
+be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_cos);
+be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str_fromstring);
+be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_obj_class_create_obj);
+be_define_const_str(EXTERNAL_I2S, "EXTERNAL_I2S", 4067456169u, 0, 12, &be_const_str_bri);
+be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_unknown_X20instruction);
+be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_widget_instance_size);
+be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_get_pixel_color);
+be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, NULL);
+be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_start);
+be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_addr);
+be_define_const_str(INTERNAL_DAC, "INTERNAL_DAC", 1097623719u, 0, 12, &be_const_str_size);
+be_define_const_str(INTERNAL_PDM, "INTERNAL_PDM", 3043685628u, 0, 12, &be_const_str_init_draw_arc_dsc);
+be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str_available);
+be_define_const_str(LVG_X3A_X20object_X3A, "LVG: object:", 3824079937u, 0, 12, &be_const_str_compress);
+be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_add);
+be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, &be_const_str_write_bytes);
+be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_SERIAL_5E1);
+be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_percentage);
+be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_name);
+be_define_const_str(OpusDecoder, "OpusDecoder", 3618742074u, 0, 11, &be_const_str_matrix);
+be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str_get_height);
+be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_super);
+be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, &be_const_str_coord_arr);
+be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_remove);
+be_define_const_str(RGB, "RGB", 3386082140u, 0, 3, NULL);
+be_define_const_str(RGBCT, "RGBCT", 8076251u, 0, 5, NULL);
+be_define_const_str(RGBW, "RGBW", 3270986321u, 0, 4, &be_const_str_set_bits_per_sample);
+be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, &be_const_str_null_cb);
+be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, NULL);
+be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, NULL);
+be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_lv_point);
+be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_set);
 be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, NULL);
-be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str_deinit);
-be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, NULL);
-be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_finish);
-be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_running);
-be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_SERIAL_8N1);
-be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_SERIAL_7E2);
-be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_SERIAL_7E1);
-be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_get_vbus_current);
-be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_clear);
-be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, &be_const_str_ctor);
-be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_load);
-be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_sqrt);
-be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_True);
-be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_copy);
-be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_WS2812);
-be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, NULL);
-be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_set_style_pad_right);
-be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_page_autoconf_ctl);
-be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_exists);
-be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_time_reached);
-be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
-be_define_const_str(TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: Loaded Tasmota App '%s'", 926477145u, 0, 28, &be_const_str_widget_constructor);
-be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_tcpclient);
-be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_fromstring);
-be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_tele);
-be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_classof);
-be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_pixels_buffer);
-be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_classname);
-be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str_cosh);
-be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str__debug_present);
-be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_get_battery_chargin_status);
-be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_readline);
-be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_back_forth);
-be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_draw_line_dsc_init);
-be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_get_style_line_color);
-be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_add_event_cb);
-be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_fast_loop_enabled);
-be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_set_bits_per_sample);
-be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_contains);
+be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str__read);
+be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, &be_const_str_set_pixel_color);
+be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_Unknown_X20command);
+be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_depower);
+be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_clear_first_time);
+be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_atleast1);
+be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_iter);
+be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_stop_iteration);
+be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_json_append);
+be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, &be_const_str_list_handlers);
+be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_fast_loop);
+be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_arc_dsc);
+be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, NULL);
+be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, NULL);
+be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_animators);
+be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_serial);
+be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, NULL);
+be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_from_to);
+be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_gamma10);
+be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_back_forth);
+be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_isinstance);
+be_define_const_str(TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: Loaded Tasmota App '%s'", 926477145u, 0, 28, NULL);
+be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_group_def);
+be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_color);
+be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_get_input_power_status);
+be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_screenshot);
+be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_content_button);
+be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_remove_driver);
+be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str__settings_ptr);
+be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str_get_temp);
+be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str__available);
+be_define_const_str(_X5D, "]", 3624670792u, 0, 1, NULL);
+be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_code);
+be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_deregister_obj);
+be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_listdir);
+be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_dump);
+be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_lv_event_cb);
+be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_set_percentage);
+be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_draw_line);
 be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, NULL);
-be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_arch);
-be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_atan);
-be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str_remote_ip);
-be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, NULL);
-be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_get_bat_current);
-be_define_const_str(_def, "_def", 1985022181u, 0, 4, &be_const_str_json_fdump);
-be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_settings);
+be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, NULL);
+be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_line_dsc);
+be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str__debug_present);
+be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_event_cb);
+be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_clear_to);
+be_define_const_str(_def, "_def", 1985022181u, 0, 4, &be_const_str_autoexec);
+be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_deg);
 be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, NULL);
-be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str__fl);
-be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_event_cb);
-be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27);
-be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_kv);
-be_define_const_str(_fl, "_fl", 4042564892u, 0, 3, &be_const_str_get_input_power_status);
-be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_deg);
-be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, NULL);
-be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_chars_in_string);
+be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, NULL);
+be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_lv_solidified);
+be_define_const_str(_error, "_error", 1132109656u, 0, 6, NULL);
+be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, NULL);
+be_define_const_str(_fl, "_fl", 4042564892u, 0, 3, &be_const_str__p);
+be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, NULL);
+be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_map);
+be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_add_rule);
 be_define_const_str(_p, "_p", 1594591802u, 0, 2, NULL);
-be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_get_current_module_name);
-be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_scale_uint);
-be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_create_segment);
-be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, &be_const_str_save_before_restart);
-be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, &be_const_str_add_cmd);
-be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_argument_X20must_X20be_X20a_X20function);
+be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_compile);
+be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_real);
+be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_imax);
+be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
+be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, &be_const_str_font_seg7);
+be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_draw_arc_dsc);
 be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, NULL);
-be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_tr);
-be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_delay);
-be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_closure);
-be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_asin);
-be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_constructor_cb);
-be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_widget_ctor_cb);
-be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_readbytes);
-be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_byte);
-be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, NULL);
-be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, &be_const_str_char);
-be_define_const_str(add_event_cb, "add_event_cb", 633097693u, 0, 12, NULL);
-be_define_const_str(add_fast_loop, "add_fast_loop", 3025842946u, 0, 13, &be_const_str_get_switch);
-be_define_const_str(add_handler, "add_handler", 2055124119u, 0, 11, &be_const_str_id);
+be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_char);
+be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_value_error);
+be_define_const_str(_write, "_write", 2215462825u, 0, 6, NULL);
+be_define_const_str(a, "a", 3826002220u, 0, 1, NULL);
+be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_math);
+be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_asin);
+be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_read32);
+be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_instance_size);
+be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_traceback);
+be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, NULL);
+be_define_const_str(add_event_cb, "add_event_cb", 633097693u, 0, 12, &be_const_str_create_matrix);
+be_define_const_str(add_fast_loop, "add_fast_loop", 3025842946u, 0, 13, NULL);
+be_define_const_str(add_handler, "add_handler", 2055124119u, 0, 11, NULL);
 be_define_const_str(add_header, "add_header", 927130612u, 0, 10, NULL);
-be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_function);
-be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_load_freetype_font);
-be_define_const_str(allocated, "allocated", 429986098u, 0, 9, NULL);
-be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, NULL);
-be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_files);
-be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_ip);
-be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_cb_obj);
-be_define_const_str(area, "area", 2601460036u, 0, 4, NULL);
-be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_pc);
-be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_content_start);
+be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_ins_goto);
+be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_ctypes_bytes);
+be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_get_bat_power);
+be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_ctypes_bytes_dyn);
+be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_register_button_encoder);
+be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_read_bytes);
+be_define_const_str(arc_dsc, "arc_dsc", 2768816310u, 0, 7, &be_const_str_connection_error);
+be_define_const_str(arch, "arch", 2952804297u, 0, 4, NULL);
+be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_content_stop);
+be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_draw_line_dsc_init);
+be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_dimmer);
 be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, NULL);
-be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, &be_const_str_atan2);
-be_define_const_str(argument_X20must_X20be_X20a_X20function, "argument must be a function", 527172389u, 0, 27, &be_const_str_can_show);
-be_define_const_str(argument_X20must_X20be_X20a_X20list, "argument must be a list", 3056915661u, 0, 23, &be_const_str_read12);
+be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, &be_const_str_decode);
+be_define_const_str(argument_X20must_X20be_X20a_X20function, "argument must be a function", 527172389u, 0, 27, NULL);
+be_define_const_str(argument_X20must_X20be_X20a_X20list, "argument must be a list", 3056915661u, 0, 23, NULL);
 be_define_const_str(as, "as", 1579491469u, 67, 2, NULL);
-be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_lv_);
-be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_zip);
-be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, NULL);
-be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_remove_rule);
-be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, NULL);
-be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_set_style_bg_color);
-be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_set_pwm);
-be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_elements_X20must_X20be_X20a_X20lv_point);
-be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, NULL);
-be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_clear_to);
-be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_on);
+be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_destructor_cb);
+be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_ip);
+be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_pixel_count);
+be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_tolower);
+be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_get_bat_current);
+be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_remote_port);
+be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, NULL);
+be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_clock_icon);
+be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_load_freetype_font);
+be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_clear);
+be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_content_send_style);
 be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, NULL);
-be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, NULL);
-be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_list_handlers);
-be_define_const_str(before_del, "before_del", 815924436u, 0, 10, &be_const_str_draw_line);
-be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_remove_cmd);
-be_define_const_str(begin_multicast, "begin_multicast", 57647915u, 0, 15, NULL);
-be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_dirty);
+be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str__X7B);
+be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, NULL);
+be_define_const_str(before_del, "before_del", 815924436u, 0, 10, &be_const_str_get_warning_level);
+be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_resolvecmnd);
+be_define_const_str(begin_multicast, "begin_multicast", 57647915u, 0, 15, &be_const_str_set_xy);
+be_define_const_str(bool, "bool", 3365180733u, 0, 4, NULL);
 be_define_const_str(break, "break", 3378807160u, 58, 5, NULL);
-be_define_const_str(bri, "bri", 2112284244u, 0, 3, NULL);
-be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_get_string);
-be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_create_matrix);
-be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_return_X20code_X3D_X25i);
-be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_call_native);
-be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_get_vbus_voltage);
-be_define_const_str(call, "call", 3018949801u, 0, 4, NULL);
-be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_hs2rgb);
-be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_close);
+be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_wifi);
+be_define_const_str(bus, "bus", 1607822841u, 0, 3, NULL);
+be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_insert);
+be_define_const_str(byte, "byte", 1683620383u, 0, 4, NULL);
+be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, NULL);
+be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_get_switch);
+be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_h);
+be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_set_auth);
+be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_set_alternate);
 be_define_const_str(can_show, "can_show", 960091187u, 0, 8, NULL);
-be_define_const_str(cb, "cb", 1428787088u, 0, 2, &be_const_str_range);
-be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_dump);
-be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, NULL);
-be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_ins_ramp);
-be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_try_rule);
-be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_get_aps_voltage);
-be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_set_x);
-be_define_const_str(check_not_method, "check_not_method", 2597324607u, 0, 16, &be_const_str_json_fdump_any);
-be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_dac_voltage);
+be_define_const_str(cb, "cb", 1428787088u, 0, 2, &be_const_str_every_50ms);
+be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus);
+be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, &be_const_str_get_bri);
+be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_y1);
+be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_last_modified);
+be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_return_X20code_X3D_X25i);
+be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, NULL);
+be_define_const_str(check_not_method, "check_not_method", 2597324607u, 0, 16, NULL);
+be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_read13);
 be_define_const_str(class, "class", 2872970239u, 57, 5, NULL);
-be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_code);
-be_define_const_str(classname, "classname", 1998589948u, 0, 9, &be_const_str_publish);
-be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_lv_event);
-be_define_const_str(clear, "clear", 1550717474u, 0, 5, &be_const_str_get_option);
-be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_instance_size);
-be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, NULL);
-be_define_const_str(clock_icon, "clock_icon", 544669651u, 0, 10, &be_const_str_end);
+be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, NULL);
+be_define_const_str(classname, "classname", 1998589948u, 0, 9, &be_const_str_ins_time);
+be_define_const_str(classof, "classof", 1796577762u, 0, 7, NULL);
+be_define_const_str(clear, "clear", 1550717474u, 0, 5, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf);
+be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_target);
+be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_geti);
+be_define_const_str(clock_icon, "clock_icon", 544669651u, 0, 10, &be_const_str_y);
 be_define_const_str(close, "close", 667630371u, 0, 5, NULL);
-be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_decrypt);
-be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_class);
-be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, NULL);
-be_define_const_str(code, "code", 4180765940u, 0, 4, NULL);
-be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_gamma10);
-be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_lv_extra);
-be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_f);
+be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_setmember);
+be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_event);
+be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, &be_const_str_connect);
+be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_min);
+be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_i2c_enabled);
+be_define_const_str(collect, "collect", 2399039025u, 0, 7, NULL);
+be_define_const_str(color, "color", 1031692888u, 0, 5, NULL);
 be_define_const_str(compile, "compile", 1000265118u, 0, 7, NULL);
-be_define_const_str(compress, "compress", 2818084237u, 0, 8, NULL);
-be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_has);
-be_define_const_str(connect, "connect", 2866859257u, 0, 7, NULL);
-be_define_const_str(connected, "connected", 1424938192u, 0, 9, NULL);
-be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, NULL);
-be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_deregister_obj);
-be_define_const_str(consume_mono, "consume_mono", 3577563453u, 0, 12, &be_const_str_tolower);
-be_define_const_str(consume_silence, "consume_silence", 1445390925u, 0, 15, &be_const_str_p2);
-be_define_const_str(consume_stereo, "consume_stereo", 1834661098u, 0, 14, &be_const_str_h);
-be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_has_X20already_X20an_X20event_X20callback);
-be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, NULL);
-be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_set_gain);
-be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_write_bit);
-be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, NULL);
-be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_get_style_bg_color);
-be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_decompress);
+be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_debug);
+be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_font_montserrat);
+be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_contains);
+be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_find);
+be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_consume_silence);
+be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_sinh);
+be_define_const_str(consume_mono, "consume_mono", 3577563453u, 0, 12, NULL);
+be_define_const_str(consume_silence, "consume_silence", 1445390925u, 0, 15, &be_const_str_log10);
+be_define_const_str(consume_stereo, "consume_stereo", 1834661098u, 0, 14, &be_const_str_create_custom_widget);
+be_define_const_str(contains, "contains", 1825239352u, 0, 8, NULL);
+be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_format);
+be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_list);
+be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_montserrat_font);
+be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_wifi_bars_icon);
+be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_fromptr);
+be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_set_dcdc_enable);
 be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL);
-be_define_const_str(coord_arr, "coord_arr", 4189963658u, 0, 9, &be_const_str_pop_path);
-be_define_const_str(copy, "copy", 3848464964u, 0, 4, NULL);
-be_define_const_str(cos, "cos", 4220379804u, 0, 3, NULL);
-be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, NULL);
+be_define_const_str(coord_arr, "coord_arr", 4189963658u, 0, 9, &be_const_str_day);
+be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_internal_error);
+be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_every_100ms);
+be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_digital_write);
 be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, NULL);
-be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_continue);
-be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_fast_loop);
-be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_event_send);
-be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_lv_event_cb);
-be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, NULL);
-be_define_const_str(ctor, "ctor", 375399343u, 0, 4, NULL);
-be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, &be_const_str_isrunning);
+be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_loop);
+be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_on);
+be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, NULL);
+be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_has_arg);
+be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_lv_obj);
+be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_dirty);
+be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, &be_const_str_font_embedded);
 be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, NULL);
-be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_event);
-be_define_const_str(day, "day", 3830391293u, 0, 3, NULL);
-be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_input);
-be_define_const_str(decode, "decode", 3007678287u, 0, 6, &be_const_str_out_X20of_X20range);
-be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_for);
-be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, NULL);
+be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_except);
+be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_duration);
+be_define_const_str(debug, "debug", 1483009432u, 0, 5, NULL);
+be_define_const_str(decode, "decode", 3007678287u, 0, 6, &be_const_str_exec_rules);
+be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_send_multicast);
+be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_energy_struct);
 be_define_const_str(def, "def", 3310976652u, 55, 3, NULL);
-be_define_const_str(deg, "deg", 3327754271u, 0, 3, NULL);
-be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_destructor_cb);
-be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_save);
-be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_global);
-be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_split);
-be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_set_matrix_pixel_color);
-be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_get_current_module_path);
-be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_dimmer);
-be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_local);
-be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, &be_const_str_get_bat_power);
-be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_param);
-be_define_const_str(dimmer, "dimmer", 794270539u, 0, 6, NULL);
-be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, NULL);
-be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_resp_cmnd);
+be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_get_light);
+be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_tan);
+be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_instance_X20required);
+be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_get_bat_voltage);
+be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_resp_cmnd);
+be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_touch_update);
+be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_running);
+be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_exp);
+be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, NULL);
+be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, &be_const_str_lv_extra);
+be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_scale_uint);
+be_define_const_str(dimmer, "dimmer", 794270539u, 0, 6, &be_const_str_erase);
+be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, &be_const_str_select);
+be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_readline);
 be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, NULL);
 be_define_const_str(do, "do", 1646057492u, 65, 2, NULL);
-be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_set_timeouts);
-be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, NULL);
-be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_is_running);
-be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, &be_const_str_seti);
-be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_run);
-be_define_const_str(dump, "dump", 3663001223u, 0, 4, &be_const_str_enabled);
-be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_every_second);
-be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_type_error);
+be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, NULL);
+be_define_const_str(draw_arc_dsc, "draw_arc_dsc", 2411410957u, 0, 12, NULL);
+be_define_const_str(draw_arc_dsc_init, "draw_arc_dsc_init", 402724044u, 0, 17, &be_const_str_toptr);
+be_define_const_str(draw_ctx, "draw_ctx", 953366593u, 0, 8, &be_const_str_height_def);
+be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_send);
+be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_srand);
+be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, &be_const_str_get_battery_chargin_status);
+be_define_const_str(due, "due", 3895530293u, 0, 3, NULL);
+be_define_const_str(dump, "dump", 3663001223u, 0, 4, &be_const_str_obj_event_base);
+be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_isrunning);
+be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_resize);
 be_define_const_str(elements_X20must_X20be_X20a_X20lv_point, "elements must be a lv_point", 1415796524u, 0, 27, NULL);
 be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL);
 be_define_const_str(else, "else", 3183434736u, 52, 4, NULL);
-be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_issubclass);
-be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_lv_obj);
+be_define_const_str(enabled, "enabled", 49525662u, 0, 7, NULL);
+be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_resp_cmnd_str);
 be_define_const_str(end, "end", 1787721130u, 56, 3, NULL);
-be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, &be_const_str_hour);
-be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_lv_obj_class);
-be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_get);
-be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_offset);
-be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_path);
-be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_obj_class_create_obj);
-be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, NULL);
-be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_get_height);
+be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, NULL);
+be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_escape);
+be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_is_first_time);
+be_define_const_str(escape, "escape", 2652972038u, 0, 6, NULL);
+be_define_const_str(eth, "eth", 2191266556u, 0, 3, NULL);
+be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_seti);
+be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_resp_cmnd_failed);
+be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_month);
 be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, NULL);
-be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_screenshot);
-be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_wifi_arcs_icon);
+be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_widget_struct_default);
+be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_raise);
 be_define_const_str(except, "except", 950914032u, 69, 6, NULL);
-be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_flush);
-be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_lv_module_init);
-be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_set_channels);
-be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_set_mode_ct);
-be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_offseta);
+be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_local);
+be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, NULL);
+be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, NULL);
+be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_json_fdump_map);
+be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_register_obj);
 be_define_const_str(f, "f", 3809224601u, 0, 1, NULL);
 be_define_const_str(false, "false", 184981848u, 62, 5, NULL);
-be_define_const_str(fast_loop, "fast_loop", 3414422702u, 0, 9, NULL);
-be_define_const_str(fast_loop_enabled, "fast_loop_enabled", 2567964376u, 0, 17, NULL);
-be_define_const_str(file, "file", 2867484483u, 0, 4, &be_const_str_reverse);
-be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, NULL);
-be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_pin_mode);
-be_define_const_str(find, "find", 3186656602u, 0, 4, &be_const_str_send);
+be_define_const_str(fast_loop, "fast_loop", 3414422702u, 0, 9, &be_const_str_set_light);
+be_define_const_str(fast_loop_enabled, "fast_loop_enabled", 2567964376u, 0, 17, &be_const_str_set_style_line_color);
+be_define_const_str(file, "file", 2867484483u, 0, 4, &be_const_str_gpio);
+be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_hour);
+be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_gen_cb);
+be_define_const_str(find, "find", 3186656602u, 0, 4, &be_const_str_remove_cmd);
 be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, NULL);
 be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, NULL);
-be_define_const_str(finish, "finish", 1494643858u, 0, 6, NULL);
-be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_get_pixel_color);
-be_define_const_str(flush, "flush", 3002334877u, 0, 5, NULL);
-be_define_const_str(font_montserrat, "font_montserrat", 3790091262u, 0, 15, &be_const_str_k);
-be_define_const_str(font_seg7, "font_seg7", 1551771835u, 0, 9, &be_const_str_read);
+be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_target_search);
+be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_tele);
+be_define_const_str(flush, "flush", 3002334877u, 0, 5, &be_const_str_while);
+be_define_const_str(font_embedded, "font_embedded", 1623675143u, 0, 13, &be_const_str_rounded);
+be_define_const_str(font_montserrat, "font_montserrat", 3790091262u, 0, 15, &be_const_str_reset);
+be_define_const_str(font_seg7, "font_seg7", 1551771835u, 0, 9, &be_const_str_has);
 be_define_const_str(for, "for", 2901640080u, 54, 3, NULL);
-be_define_const_str(format, "format", 3114108242u, 0, 6, NULL);
-be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_widget_dtor_impl);
-be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, &be_const_str_gamma8);
-be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032);
+be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_get_percentage);
+be_define_const_str(from_to, "from_to", 21625507u, 0, 7, NULL);
+be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, NULL);
+be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_set_huesat);
 be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, NULL);
-be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_invalidate);
-be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_pin_used);
+be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_is_running);
+be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_hs2rgb);
 be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, NULL);
-be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_insert);
-be_define_const_str(gc, "gc", 1042313471u, 0, 2, &be_const_str_set_pixel_color);
+be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_memory);
+be_define_const_str(gc, "gc", 1042313471u, 0, 2, NULL);
 be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, NULL);
-be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str_set_huesat);
-be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_set_light);
-be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, NULL);
-be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, NULL);
-be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, &be_const_str_light);
+be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str__X7D);
+be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_set_style_pad_right);
+be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, &be_const_str_lower);
+be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_init_draw_line_dsc);
+be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, &be_const_str_millis);
 be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, NULL);
-be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, &be_const_str_isnan);
-be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, NULL);
-be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_lv_wifi_bars);
-be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_i2c_enabled);
-be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_leds);
-be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, NULL);
-be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, &be_const_str_last_modified);
-be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_set_y);
-be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_nil);
-be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, NULL);
-be_define_const_str(get_light, "get_light", 381930476u, 0, 9, &be_const_str_is_dirty);
-be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str_min);
-be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, &be_const_str_item);
-be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, &be_const_str_has_arg);
-be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, &be_const_str_web_add_button);
-be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, NULL);
-be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, &be_const_str_target_search);
-be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, NULL);
-be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_web_sensor);
+be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, NULL);
+be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, &be_const_str_set_dc_voltage);
+be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_ins_ramp);
+be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_save);
+be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, NULL);
+be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_get_width);
+be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, &be_const_str_save_before_restart);
+be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_minute);
+be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, NULL);
+be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, &be_const_str_time_dump);
+be_define_const_str(get_light, "get_light", 381930476u, 0, 9, NULL);
+be_define_const_str(get_log, "get_log", 3524441898u, 0, 7, NULL);
+be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str_read_sensors);
+be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, NULL);
+be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, NULL);
+be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, &be_const_str_run_bat);
+be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_push_path);
+be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL);
+be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, &be_const_str_set_style_text_font);
+be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_response_append);
 be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, NULL);
-be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, &be_const_str_month);
-be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_get_temp);
-be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, &be_const_str_setitem);
-be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, NULL);
-be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_member);
-be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, &be_const_str_get_width);
-be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, &be_const_str_reverse_gamma10);
-be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_init);
+be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, NULL);
+be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_time_reached);
+be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, &be_const_str_keys);
+be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_set_ct);
+be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, NULL);
+be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, &be_const_str_r);
+be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, NULL);
+be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_sqrt);
 be_define_const_str(geti, "geti", 2381006490u, 0, 4, NULL);
-be_define_const_str(global, "global", 503252654u, 0, 6, &be_const_str_nan);
-be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, NULL);
-be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_make_cb);
-be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_time_dump);
-be_define_const_str(has, "has", 3988721635u, 0, 3, NULL);
-be_define_const_str(has_X20already_X20an_X20event_X20callback, "has already an event callback", 2421565249u, 0, 29, NULL);
-be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, NULL);
-be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
-be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_obj_event_base);
-be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_number);
+be_define_const_str(global, "global", 503252654u, 0, 6, NULL);
+be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus);
+be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_wire2);
+be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_settings);
+be_define_const_str(has, "has", 3988721635u, 0, 3, &be_const_str_lv_module_init);
+be_define_const_str(has_X20already_X20an_X20event_X20callback, "has already an event callback", 2421565249u, 0, 29, &be_const_str_lv_signal_bars);
+be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str_tcpclient);
+be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, NULL);
+be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_lv_wifi_bars_icon);
+be_define_const_str(hour, "hour", 3053661199u, 0, 4, NULL);
 be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, NULL);
-be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_start);
-be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, &be_const_str_quality);
-be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, NULL);
-be_define_const_str(id, "id", 926444256u, 0, 2, NULL);
+be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_set_bri);
+be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, &be_const_str_json_fdump_any);
+be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_set_y);
+be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_else);
 be_define_const_str(if, "if", 959999494u, 50, 2, NULL);
-be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_json_append);
-be_define_const_str(imin, "imin", 2714127864u, 0, 4, NULL);
+be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_round_end);
+be_define_const_str(imin, "imin", 2714127864u, 0, 4, &be_const_str_json);
 be_define_const_str(import, "import", 288002260u, 66, 6, NULL);
-be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_valuer_error);
-be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_web_add_main_button);
-be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_remove_timer);
+be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_k);
+be_define_const_str(init_draw_arc_dsc, "init_draw_arc_dsc", 1655274348u, 0, 17, &be_const_str_number);
+be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_leds);
+be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_wifi_arcs_icon);
 be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, NULL);
-be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, NULL);
+be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_wire_scan);
 be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, NULL);
-be_define_const_str(insert, "insert", 3332609576u, 0, 6, &be_const_str_keys);
-be_define_const_str(instance, "instance", 193386898u, 0, 8, NULL);
-be_define_const_str(instance_X20required, "instance required", 381192159u, 0, 17, &be_const_str_read13);
-be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, &be_const_str_log);
-be_define_const_str(int, "int", 2515107422u, 0, 3, NULL);
-be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, NULL);
-be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_stop);
-be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_resize);
+be_define_const_str(insert, "insert", 3332609576u, 0, 6, NULL);
+be_define_const_str(instance, "instance", 193386898u, 0, 8, &be_const_str_json_fdump_list);
+be_define_const_str(instance_X20required, "instance required", 381192159u, 0, 17, NULL);
+be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, NULL);
+be_define_const_str(int, "int", 2515107422u, 0, 3, &be_const_str_push);
+be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_set_mode_rgb);
+be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_sec);
 be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, NULL);
-be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_solidified);
-be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_show);
-be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus);
-be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_publish_result);
-be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, &be_const_str_light_state);
-be_define_const_str(ismethod, "ismethod", 3513438880u, 0, 8, &be_const_str_webclient);
-be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_preinit);
-be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_open);
-be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_set_style_text_font);
-be_define_const_str(item, "item", 2671260646u, 0, 4, NULL);
-be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_lv_signal_arcs);
-be_define_const_str(json, "json", 916562499u, 0, 4, &be_const_str_break);
-be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, &be_const_str_read24);
-be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, &be_const_str_set_dcdc_enable);
-be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_reset_search);
-be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_write8);
-be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_line_dsc);
-be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_push);
-be_define_const_str(keys, "keys", 4182378701u, 0, 4, &be_const_str_resp_cmnd_error);
-be_define_const_str(kv, "kv", 1497177492u, 0, 2, NULL);
-be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_log10);
-be_define_const_str(leds, "leds", 558858555u, 0, 4, NULL);
-be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_members);
+be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_reverse);
+be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, NULL);
+be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, NULL);
+be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_item);
+be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, NULL);
+be_define_const_str(ismethod, "ismethod", 3513438880u, 0, 8, &be_const_str_uuid4);
+be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, NULL);
+be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, NULL);
+be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, NULL);
+be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_member);
+be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_load);
+be_define_const_str(json, "json", 916562499u, 0, 4, &be_const_str_skip);
+be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, &be_const_str_sys);
+be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, NULL);
+be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, NULL);
+be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_wd);
+be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, NULL);
+be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_pc_abs);
+be_define_const_str(keys, "keys", 4182378701u, 0, 4, NULL);
+be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_reverse_gamma10);
+be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_set_gain);
+be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_module);
+be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, NULL);
 be_define_const_str(light, "light", 3801947695u, 0, 5, NULL);
-be_define_const_str(light_state, "light_state", 905783845u, 0, 11, &be_const_str_yield);
+be_define_const_str(light_state, "light_state", 905783845u, 0, 11, &be_const_str_remove_timer);
 be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, NULL);
-be_define_const_str(list, "list", 217798785u, 0, 4, NULL);
-be_define_const_str(list_handlers, "list_handlers", 593774371u, 0, 13, &be_const_str_string);
-be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, &be_const_str_to_gamma);
-be_define_const_str(load, "load", 3859241449u, 0, 4, &be_const_str_pin);
-be_define_const_str(load_freetype_font, "load_freetype_font", 2368447592u, 0, 18, &be_const_str_read_bytes);
-be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, &be_const_str_name);
-be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
-be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_set_style_line_color);
-be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str_real);
-be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_resp_cmnd_failed);
-be_define_const_str(lower, "lower", 3038577850u, 0, 5, NULL);
+be_define_const_str(list, "list", 217798785u, 0, 4, &be_const_str_read12);
+be_define_const_str(list_handlers, "list_handlers", 593774371u, 0, 13, &be_const_str_readbytes);
+be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, &be_const_str_widget_group_def);
+be_define_const_str(load, "load", 3859241449u, 0, 4, NULL);
+be_define_const_str(load_freetype_font, "load_freetype_font", 2368447592u, 0, 18, &be_const_str_web_add_console_button);
+be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, NULL);
+be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_wire);
+be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_lv_wifi_bars);
+be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
+be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_set_height);
+be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_v);
 be_define_const_str(lv, "lv", 1529997255u, 0, 2, NULL);
 be_define_const_str(lv_, "lv_", 663721032u, 0, 3, NULL);
 be_define_const_str(lv_clock_icon, "lv_clock_icon", 3257216210u, 0, 13, NULL);
-be_define_const_str(lv_coord_arr, "lv_coord_arr", 1197238601u, 0, 12, &be_const_str_set_ldo_enable);
-be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_pixel_size);
-be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, NULL);
+be_define_const_str(lv_coord_arr, "lv_coord_arr", 1197238601u, 0, 12, NULL);
+be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, NULL);
+be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_run_deferred);
 be_define_const_str(lv_extra, "lv_extra", 399561998u, 0, 8, NULL);
 be_define_const_str(lv_module_init, "lv_module_init", 1133027755u, 0, 14, NULL);
-be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_search);
-be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, &be_const_str_millis);
-be_define_const_str(lv_point, "lv_point", 4120221790u, 0, 8, &be_const_str_lv_point_arr);
-be_define_const_str(lv_point_arr, "lv_point_arr", 3959768858u, 0, 12, &be_const_str_pixel_count);
-be_define_const_str(lv_signal_arcs, "lv_signal_arcs", 2839156988u, 0, 14, &be_const_str_else);
+be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_p1);
+be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, NULL);
+be_define_const_str(lv_point, "lv_point", 4120221790u, 0, 8, &be_const_str_valuer_error);
+be_define_const_str(lv_point_arr, "lv_point_arr", 3959768858u, 0, 12, NULL);
+be_define_const_str(lv_signal_arcs, "lv_signal_arcs", 2839156988u, 0, 14, NULL);
 be_define_const_str(lv_signal_bars, "lv_signal_bars", 3513972559u, 0, 14, NULL);
-be_define_const_str(lv_solidified, "lv_solidified", 2274121310u, 0, 13, &be_const_str_set_dc_voltage);
-be_define_const_str(lv_wifi_arcs, "lv_wifi_arcs", 2082091963u, 0, 12, NULL);
-be_define_const_str(lv_wifi_arcs_icon, "lv_wifi_arcs_icon", 1507982909u, 0, 17, NULL);
-be_define_const_str(lv_wifi_bars, "lv_wifi_bars", 2109539196u, 0, 12, NULL);
+be_define_const_str(lv_solidified, "lv_solidified", 2274121310u, 0, 13, &be_const_str_quality);
+be_define_const_str(lv_wifi_arcs, "lv_wifi_arcs", 2082091963u, 0, 12, &be_const_str_top);
+be_define_const_str(lv_wifi_arcs_icon, "lv_wifi_arcs_icon", 1507982909u, 0, 17, &be_const_str_web_add_main_button);
+be_define_const_str(lv_wifi_bars, "lv_wifi_bars", 2109539196u, 0, 12, &be_const_str_write_bit);
 be_define_const_str(lv_wifi_bars_icon, "lv_wifi_bars_icon", 2805815540u, 0, 17, NULL);
-be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_montserrat_font);
-be_define_const_str(make_cb, "make_cb", 71252785u, 0, 7, NULL);
-be_define_const_str(map, "map", 3751997361u, 0, 3, NULL);
-be_define_const_str(math, "math", 4001929615u, 0, 4, NULL);
-be_define_const_str(matrix, "matrix", 365099244u, 0, 6, NULL);
-be_define_const_str(member, "member", 719708611u, 0, 6, &be_const_str_set_time);
+be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, NULL);
+be_define_const_str(make_cb, "make_cb", 71252785u, 0, 7, &be_const_str_set_timeouts);
+be_define_const_str(map, "map", 3751997361u, 0, 3, &be_const_str_redirect);
+be_define_const_str(math, "math", 4001929615u, 0, 4, &be_const_str_import);
+be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_members);
+be_define_const_str(member, "member", 719708611u, 0, 6, &be_const_str_sin);
 be_define_const_str(members, "members", 937576464u, 0, 7, NULL);
-be_define_const_str(memory, "memory", 2229924270u, 0, 6, NULL);
-be_define_const_str(millis, "millis", 1214679063u, 0, 6, NULL);
-be_define_const_str(min, "min", 3381609815u, 0, 3, NULL);
-be_define_const_str(minute, "minute", 954666857u, 0, 6, &be_const_str_module);
+be_define_const_str(memory, "memory", 2229924270u, 0, 6, &be_const_str_widget_dtor_impl);
+be_define_const_str(millis, "millis", 1214679063u, 0, 6, &be_const_str_webserver);
+be_define_const_str(min, "min", 3381609815u, 0, 3, &be_const_str_set_ldo_voltage);
+be_define_const_str(minute, "minute", 954666857u, 0, 6, NULL);
 be_define_const_str(module, "module", 3617558685u, 0, 6, NULL);
-be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_write);
-be_define_const_str(montserrat_font, "montserrat_font", 1819065874u, 0, 15, NULL);
+be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_set_matrix_pixel_color);
+be_define_const_str(montserrat_font, "montserrat_font", 1819065874u, 0, 15, &be_const_str_write_gpio);
 be_define_const_str(name, "name", 2369371622u, 0, 4, NULL);
 be_define_const_str(nan, "nan", 797905850u, 0, 3, NULL);
 be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL);
-be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, NULL);
-be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, NULL);
+be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_strip);
+be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, &be_const_str_width);
 be_define_const_str(number, "number", 467038368u, 0, 6, NULL);
-be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, NULL);
-be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, &be_const_str_web_add_config_button);
+be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map);
+be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, NULL);
 be_define_const_str(offset, "offset", 348705738u, 0, 6, NULL);
 be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, NULL);
-be_define_const_str(on, "on", 1630810064u, 0, 2, &be_const_str_widget_instance_size);
-be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, &be_const_str_wifi_bars_icon);
-be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_touch_update);
-be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_widget_group_def);
-be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, NULL);
-be_define_const_str(p1, "p1", 2689521274u, 0, 2, NULL);
-be_define_const_str(p2, "p2", 2672743655u, 0, 2, &be_const_str_url_encode);
-be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, NULL);
-be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_web_add_console_button);
-be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_widget_destructor);
-be_define_const_str(path, "path", 2223459638u, 0, 4, NULL);
+be_define_const_str(on, "on", 1630810064u, 0, 2, NULL);
+be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, &be_const_str_refr_size);
+be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_tag);
+be_define_const_str(open, "open", 3546203337u, 0, 4, NULL);
+be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, &be_const_str_web_add_handler);
+be_define_const_str(p1, "p1", 2689521274u, 0, 2, &be_const_str_widget_event_cb);
+be_define_const_str(p2, "p2", 2672743655u, 0, 2, NULL);
+be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_pc_rel);
+be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_webclient);
+be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_point);
+be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_pop_path);
 be_define_const_str(pc, "pc", 1313756516u, 0, 2, NULL);
-be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, NULL);
-be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, NULL);
-be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_web_send);
+be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, &be_const_str_pixel_size);
+be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, &be_const_str_true);
+be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_pin);
 be_define_const_str(persist, "persist", 3917083779u, 0, 7, NULL);
-be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, NULL);
-be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_setrange);
-be_define_const_str(pin, "pin", 1866532500u, 0, 3, NULL);
-be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_true);
-be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, NULL);
-be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, &be_const_str_zero);
-be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, &be_const_str_strip);
-be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, NULL);
-be_define_const_str(point, "point", 414084241u, 0, 5, NULL);
-be_define_const_str(point_arr, "point_arr", 1140859857u, 0, 9, &be_const_str_rotate);
-be_define_const_str(pop, "pop", 1362321360u, 0, 3, &be_const_str_tasmota);
-be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, &be_const_str_scan);
-be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_toptr);
-be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, &be_const_str_rtc);
-be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D);
-be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_refr_size);
-be_define_const_str(publish, "publish", 264247304u, 0, 7, NULL);
-be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_run_deferred);
-be_define_const_str(push, "push", 2272264157u, 0, 4, NULL);
-be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, NULL);
-be_define_const_str(quality, "quality", 2597670950u, 0, 7, &be_const_str_value_error);
+be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_to_gamma);
+be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_widget_struct_by_class);
+be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_state);
+be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, NULL);
+be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_upper);
+be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, NULL);
+be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, NULL);
+be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, &be_const_str_web_sensor);
+be_define_const_str(point, "point", 414084241u, 0, 5, &be_const_str_strptime);
+be_define_const_str(point_arr, "point_arr", 1140859857u, 0, 9, NULL);
+be_define_const_str(pop, "pop", 1362321360u, 0, 3, NULL);
+be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, NULL);
+be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_remote_ip);
+be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, NULL);
+be_define_const_str(print, "print", 372738696u, 0, 5, NULL);
+be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_set_text);
+be_define_const_str(publish, "publish", 264247304u, 0, 7, &be_const_str_wire1);
+be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_set_x);
+be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_run);
+be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, &be_const_str_reapply);
+be_define_const_str(quality, "quality", 2597670950u, 0, 7, &be_const_str_try_rule);
 be_define_const_str(r, "r", 4144776981u, 0, 1, NULL);
-be_define_const_str(rad, "rad", 1358899048u, 0, 3, NULL);
+be_define_const_str(rad, "rad", 1358899048u, 0, 3, &be_const_str_set_rate);
 be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL);
 be_define_const_str(rand, "rand", 2711325910u, 0, 4, NULL);
-be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_set_first_time);
-be_define_const_str(read, "read", 3470762949u, 0, 4, NULL);
-be_define_const_str(read12, "read12", 4291076970u, 0, 6, &be_const_str_x1);
-be_define_const_str(read13, "read13", 12887293u, 0, 6, NULL);
-be_define_const_str(read24, "read24", 1808533811u, 0, 6, &be_const_str_web_send_decimal);
+be_define_const_str(range, "range", 4208725202u, 0, 5, NULL);
+be_define_const_str(read, "read", 3470762949u, 0, 4, &be_const_str_seg7_font);
+be_define_const_str(read12, "read12", 4291076970u, 0, 6, &be_const_str_web_add_config_button);
+be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_set_exten);
+be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL);
 be_define_const_str(read32, "read32", 1741276240u, 0, 6, NULL);
 be_define_const_str(read8, "read8", 2802788167u, 0, 5, NULL);
 be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, NULL);
-be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, &be_const_str_traceback);
-be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, &be_const_str_wire2);
-be_define_const_str(readline, "readline", 1212709927u, 0, 8, &be_const_str_response_append);
-be_define_const_str(real, "real", 3604983901u, 0, 4, NULL);
+be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL);
+be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, NULL);
+be_define_const_str(readline, "readline", 1212709927u, 0, 8, NULL);
+be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str_widget_event);
 be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, NULL);
-be_define_const_str(redirect, "redirect", 389758641u, 0, 8, &be_const_str_resolvecmnd);
-be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_width_def);
-be_define_const_str(register_button_encoder, "register_button_encoder", 2811301550u, 0, 23, &be_const_str_value);
-be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, NULL);
+be_define_const_str(redirect, "redirect", 389758641u, 0, 8, NULL);
+be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, NULL);
+be_define_const_str(register_button_encoder, "register_button_encoder", 2811301550u, 0, 23, &be_const_str_reset_search);
+be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, &be_const_str_set_channels);
 be_define_const_str(remote_ip, "remote_ip", 2953154693u, 0, 9, NULL);
 be_define_const_str(remote_port, "remote_port", 2163585967u, 0, 11, NULL);
 be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL);
-be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL);
+be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, &be_const_str_setbits);
 be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, NULL);
-be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_round_end);
+be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, NULL);
 be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, NULL);
-be_define_const_str(reset, "reset", 1695364032u, 0, 5, &be_const_str_widget_event_cb);
+be_define_const_str(reset, "reset", 1695364032u, 0, 5, &be_const_str_widget_width_def);
 be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, NULL);
 be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL);
-be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, &be_const_str_strftime);
+be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, &be_const_str_resp_cmnd_done);
 be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, NULL);
-be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, &be_const_str_set_ldo_voltage);
-be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, NULL);
-be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_y);
-be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, &be_const_str_state);
-be_define_const_str(response_append, "response_append", 450346371u, 0, 15, &be_const_str_wire);
+be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, &be_const_str_for);
+be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, &be_const_str_string);
+be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, NULL);
+be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, &be_const_str_url_encode);
+be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL);
 be_define_const_str(return, "return", 2246981567u, 60, 6, NULL);
-be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, &be_const_str_widget_dtor_cb);
+be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, &be_const_str_toupper);
 be_define_const_str(reverse, "reverse", 558918661u, 0, 7, NULL);
 be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, NULL);
 be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, NULL);
 be_define_const_str(round_end, "round_end", 985288225u, 0, 9, NULL);
 be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, NULL);
-be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_top);
+be_define_const_str(rounded, "rounded", 1920734138u, 0, 7, &be_const_str_wifi_bars);
+be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, NULL);
 be_define_const_str(rule, "rule", 4230889683u, 0, 4, NULL);
-be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_tan);
+be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_tasmota_log_reader);
 be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, NULL);
-be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL);
-be_define_const_str(running, "running", 343848780u, 0, 7, &be_const_str_sec);
+be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, &be_const_str_setitem);
+be_define_const_str(running, "running", 343848780u, 0, 7, NULL);
 be_define_const_str(save, "save", 3439296072u, 0, 4, NULL);
-be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, NULL);
-be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str__X7B);
-be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL);
+be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, &be_const_str_widget_height_def);
+be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, NULL);
+be_define_const_str(scan, "scan", 3974641896u, 0, 4, &be_const_str_set_ldo_enable);
 be_define_const_str(screenshot, "screenshot", 3894592561u, 0, 10, NULL);
 be_define_const_str(search, "search", 2150836393u, 0, 6, NULL);
-be_define_const_str(sec, "sec", 3139892658u, 0, 3, &be_const_str_year);
+be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL);
 be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, NULL);
 be_define_const_str(select, "select", 297952813u, 0, 6, NULL);
 be_define_const_str(send, "send", 1919010991u, 0, 4, NULL);
-be_define_const_str(send_multicast, "send_multicast", 812185870u, 0, 14, NULL);
-be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_type);
+be_define_const_str(send_multicast, "send_multicast", 812185870u, 0, 14, &be_const_str_zero);
+be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_widget_ctor_cb);
 be_define_const_str(set, "set", 3324446467u, 0, 3, NULL);
-be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, NULL);
-be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL);
+be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_do);
+be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, &be_const_str_set_rgb);
 be_define_const_str(set_bits_per_sample, "set_bits_per_sample", 3747657551u, 0, 19, NULL);
 be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, NULL);
-be_define_const_str(set_channels, "set_channels", 1370190620u, 0, 12, &be_const_str_uuid4);
-be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, &be_const_str_return);
-be_define_const_str(set_ct, "set_ct", 972363187u, 0, 6, &be_const_str_udp);
-be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, NULL);
-be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, &be_const_str_web_add_handler);
-be_define_const_str(set_exten, "set_exten", 1721782768u, 0, 9, &be_const_str_target);
+be_define_const_str(set_channels, "set_channels", 1370190620u, 0, 12, &be_const_str_set_first_time);
+be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, NULL);
+be_define_const_str(set_ct, "set_ct", 972363187u, 0, 6, NULL);
+be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, &be_const_str_split);
+be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, NULL);
+be_define_const_str(set_exten, "set_exten", 1721782768u, 0, 9, &be_const_str_set_timer);
 be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, NULL);
 be_define_const_str(set_gain, "set_gain", 3847781975u, 0, 8, NULL);
-be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, &be_const_str_sinh);
+be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, &be_const_str_width_def);
 be_define_const_str(set_huesat, "set_huesat", 626496854u, 0, 10, NULL);
-be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, &be_const_str_set_power);
-be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, &be_const_str_skip);
-be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, NULL);
+be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, NULL);
+be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, &be_const_str_widget_cb);
+be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, &be_const_str_time_str);
 be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, NULL);
-be_define_const_str(set_mode_ct, "set_mode_ct", 665073295u, 0, 11, NULL);
+be_define_const_str(set_mode_ct, "set_mode_ct", 665073295u, 0, 11, &be_const_str_signal_bars);
 be_define_const_str(set_mode_rgb, "set_mode_rgb", 852310875u, 0, 12, NULL);
 be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, NULL);
-be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, &be_const_str_write_bytes);
-be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_setbits);
-be_define_const_str(set_pwm, "set_pwm", 3781811012u, 0, 7, &be_const_str_set_width);
-be_define_const_str(set_rate, "set_rate", 1154016838u, 0, 8, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
+be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D);
+be_define_const_str(set_power, "set_power", 549820893u, 0, 9, NULL);
+be_define_const_str(set_pwm, "set_pwm", 3781811012u, 0, 7, NULL);
+be_define_const_str(set_rate, "set_rate", 1154016838u, 0, 8, NULL);
 be_define_const_str(set_rgb, "set_rgb", 3380244855u, 0, 7, NULL);
-be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, NULL);
+be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, &be_const_str_udp);
 be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, NULL);
-be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, &be_const_str_write_file);
+be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, NULL);
 be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, NULL);
-be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, NULL);
+be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, &be_const_str_widget_destructor);
 be_define_const_str(set_time, "set_time", 900236405u, 0, 8, NULL);
-be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_wire1);
-be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, NULL);
+be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, NULL);
+be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, &be_const_str_web_send);
 be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, NULL);
-be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str_wifi_bars);
-be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_update);
+be_define_const_str(set_width, "set_width", 484671920u, 0, 9, NULL);
+be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, NULL);
 be_define_const_str(set_xy, "set_xy", 1155092615u, 0, 6, NULL);
 be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, NULL);
 be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, NULL);
-be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL);
+be_define_const_str(seti, "seti", 1500556254u, 0, 4, &be_const_str_type_error);
 be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL);
-be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, NULL);
-be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, &be_const_str_widget_struct_by_class);
+be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_show);
+be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL);
 be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL);
-be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, NULL);
-be_define_const_str(show, "show", 2840060476u, 0, 4, NULL);
-be_define_const_str(signal_arcs, "signal_arcs", 1505996127u, 0, 11, NULL);
+be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_web_send_decimal);
+be_define_const_str(show, "show", 2840060476u, 0, 4, &be_const_str_tomap);
+be_define_const_str(signal_arcs, "signal_arcs", 1505996127u, 0, 11, &be_const_str_tanh);
 be_define_const_str(signal_bars, "signal_bars", 3181573600u, 0, 11, NULL);
 be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL);
 be_define_const_str(sinh, "sinh", 282220607u, 0, 4, NULL);
 be_define_const_str(size, "size", 597743964u, 0, 4, NULL);
 be_define_const_str(skip, "skip", 1097563074u, 0, 4, NULL);
 be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, NULL);
-be_define_const_str(split, "split", 2276994531u, 0, 5, NULL);
-be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, &be_const_str_srand);
-be_define_const_str(srand, "srand", 465518633u, 0, 5, &be_const_str_time_str);
-be_define_const_str(start, "start", 1697318111u, 0, 5, NULL);
+be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_strftime);
+be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function);
+be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL);
+be_define_const_str(start, "start", 1697318111u, 0, 5, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
 be_define_const_str(state, "state", 2016490230u, 0, 5, NULL);
 be_define_const_str(static, "static", 3532702267u, 71, 6, NULL);
-be_define_const_str(stop, "stop", 3411225317u, 0, 4, NULL);
+be_define_const_str(stop, "stop", 3411225317u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29);
 be_define_const_str(stop_iteration, "stop_iteration", 4173793901u, 0, 14, NULL);
 be_define_const_str(str, "str", 3259748752u, 0, 3, NULL);
-be_define_const_str(strftime, "strftime", 187738851u, 0, 8, &be_const_str_upper);
+be_define_const_str(strftime, "strftime", 187738851u, 0, 8, &be_const_str_web_add_management_button);
 be_define_const_str(string, "string", 398550328u, 0, 6, NULL);
-be_define_const_str(strip, "strip", 4246411473u, 0, 5, NULL);
+be_define_const_str(strip, "strip", 4246411473u, 0, 5, &be_const_str_type);
 be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, NULL);
-be_define_const_str(super, "super", 4152230356u, 0, 5, NULL);
+be_define_const_str(super, "super", 4152230356u, 0, 5, &be_const_str_widget_editable);
 be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL);
-be_define_const_str(tag, "tag", 2516003219u, 0, 3, &be_const_str_while);
-be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_wifi);
+be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL);
+be_define_const_str(tan, "tan", 2633446552u, 0, 3, NULL);
 be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL);
 be_define_const_str(target, "target", 845187144u, 0, 6, NULL);
-be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, &be_const_str_if);
-be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, &be_const_str_import);
+be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL);
+be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL);
 be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, NULL);
 be_define_const_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, "tasmota.set_light() is deprecated, use light.set()", 2124937871u, 0, 50, NULL);
-be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, &be_const_str__X7D);
+be_define_const_str(tasmota_log_reader, "tasmota_log_reader", 3555069257u, 0, 18, NULL);
+be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, NULL);
 be_define_const_str(tele, "tele", 3474458061u, 0, 4, NULL);
 be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, NULL);
 be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL);
-be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, &be_const_str_web_add_management_button);
+be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL);
 be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, NULL);
 be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, NULL);
-be_define_const_str(tob64, "tob64", 373777640u, 0, 5, NULL);
+be_define_const_str(tob64, "tob64", 373777640u, 0, 5, &be_const_str_continue);
 be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL);
 be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL);
-be_define_const_str(top, "top", 2802900028u, 0, 3, &be_const_str_def);
+be_define_const_str(top, "top", 2802900028u, 0, 3, NULL);
 be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL);
 be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL);
 be_define_const_str(touch_update, "touch_update", 1918102068u, 0, 12, NULL);
@@ -745,25 +754,25 @@ be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL);
 be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, NULL);
 be_define_const_str(true, "true", 1303515621u, 61, 4, NULL);
 be_define_const_str(try, "try", 2887626766u, 68, 3, NULL);
-be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, &be_const_str_widget_event_impl);
+be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, NULL);
 be_define_const_str(type, "type", 1361572173u, 0, 4, NULL);
-be_define_const_str(type_error, "type_error", 3789613824u, 0, 10, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
-be_define_const_str(udp, "udp", 1253872004u, 0, 3, NULL);
-be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, NULL);
+be_define_const_str(type_error, "type_error", 3789613824u, 0, 10, NULL);
+be_define_const_str(udp, "udp", 1253872004u, 0, 3, &be_const_str_wifi_arcs);
+be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_widget_event_impl);
 be_define_const_str(update, "update", 672109684u, 0, 6, NULL);
 be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL);
-be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, &be_const_str_widget_ctor_impl);
-be_define_const_str(uuid4, "uuid4", 1153582450u, 0, 5, NULL);
+be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL);
+be_define_const_str(uuid4, "uuid4", 1153582450u, 0, 5, &be_const_str_break);
 be_define_const_str(v, "v", 4077666505u, 0, 1, NULL);
 be_define_const_str(value, "value", 1113510858u, 0, 5, NULL);
-be_define_const_str(value_error, "value_error", 773297791u, 0, 11, &be_const_str_widget_height_def);
+be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL);
 be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, NULL);
 be_define_const_str(var, "var", 2317739966u, 64, 3, NULL);
 be_define_const_str(w, "w", 4060888886u, 0, 1, NULL);
 be_define_const_str(wd, "wd", 1531424278u, 0, 2, NULL);
 be_define_const_str(web_add_button, "web_add_button", 3537875058u, 0, 14, NULL);
-be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, 0, 21, NULL);
-be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, &be_const_str_webserver);
+be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, 0, 21, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
+be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, NULL);
 be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, NULL);
 be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, NULL);
 be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, NULL);
@@ -775,17 +784,17 @@ be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, NULL);
 be_define_const_str(while, "while", 231090382u, 53, 5, NULL);
 be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, NULL);
 be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, NULL);
-be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, &be_const_str_wifi_arcs);
+be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, NULL);
 be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, NULL);
 be_define_const_str(widget_destructor, "widget_destructor", 4207388345u, 0, 17, NULL);
 be_define_const_str(widget_dtor_cb, "widget_dtor_cb", 3151545845u, 0, 14, NULL);
 be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, NULL);
-be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, NULL);
-be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, &be_const_str_elif);
+be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, &be_const_str_year);
+be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, &be_const_str__X7B_X7D);
 be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, NULL);
-be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, &be_const_str_var);
+be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, NULL);
 be_define_const_str(widget_group_def, "widget_group_def", 1246968785u, 0, 16, NULL);
-be_define_const_str(widget_height_def, "widget_height_def", 3131667813u, 0, 17, &be_const_str__X7B_X7D);
+be_define_const_str(widget_height_def, "widget_height_def", 3131667813u, 0, 17, NULL);
 be_define_const_str(widget_instance_size, "widget_instance_size", 2055354779u, 0, 20, NULL);
 be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, NULL);
 be_define_const_str(widget_struct_default, "widget_struct_default", 781673633u, 0, 21, NULL);
@@ -793,443 +802,447 @@ be_define_const_str(widget_width_def, "widget_width_def", 3986078862u, 0, 16, NU
 be_define_const_str(width, "width", 2508680735u, 0, 5, NULL);
 be_define_const_str(width_def, "width_def", 1143717879u, 0, 9, NULL);
 be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL);
-be_define_const_str(wifi_arcs, "wifi_arcs", 3838492904u, 0, 9, NULL);
+be_define_const_str(wifi_arcs, "wifi_arcs", 3838492904u, 0, 9, &be_const_str_yield);
 be_define_const_str(wifi_arcs_icon, "wifi_arcs_icon", 767180544u, 0, 14, NULL);
 be_define_const_str(wifi_bars, "wifi_bars", 653141243u, 0, 9, NULL);
 be_define_const_str(wifi_bars_icon, "wifi_bars_icon", 3641522557u, 0, 14, NULL);
-be_define_const_str(wire, "wire", 4082753944u, 0, 4, NULL);
-be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL);
+be_define_const_str(wire, "wire", 4082753944u, 0, 4, &be_const_str_as);
+be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, &be_const_str_write);
 be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL);
 be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL);
-be_define_const_str(write, "write", 3190202204u, 0, 5, &be_const_str_as);
+be_define_const_str(write, "write", 3190202204u, 0, 5, NULL);
 be_define_const_str(write8, "write8", 3133991532u, 0, 6, NULL);
 be_define_const_str(write_bit, "write_bit", 2660990436u, 0, 9, NULL);
 be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, NULL);
 be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, NULL);
-be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, NULL);
+be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, &be_const_str_x1);
 be_define_const_str(x, "x", 4245442695u, 0, 1, NULL);
-be_define_const_str(x1, "x1", 274927234u, 0, 2, NULL);
+be_define_const_str(x1, "x1", 274927234u, 0, 2, &be_const_str_class);
 be_define_const_str(y, "y", 4228665076u, 0, 1, NULL);
-be_define_const_str(y1, "y1", 2355101727u, 0, 2, NULL);
+be_define_const_str(y1, "y1", 2355101727u, 0, 2, &be_const_str_def);
 be_define_const_str(year, "year", 2927578396u, 0, 4, &be_const_str_try);
 be_define_const_str(yield, "yield", 1821831854u, 0, 5, NULL);
 be_define_const_str(zero, "zero", 2339366755u, 0, 4, NULL);
 be_define_const_str(zip, "zip", 2877453236u, 0, 3, NULL);
-be_define_const_str(_X7B, "{", 4262220314u, 0, 1, &be_const_str_static);
-be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, &be_const_str_raise);
+be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL);
+be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL);
 be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL);
 be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D, "{s}Temp AXP{m}%.1f &deg;C{e}", 2622904081u, 0, 28, NULL);
 be_define_const_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}VBus Current{m}%.1f mA{e}", 1032721155u, 0, 28, NULL);
-be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, NULL);
+be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, &be_const_str_nil);
 be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL);
 be_define_const_str(_X7D, "}", 4161554600u, 0, 1, NULL);
 
 static const bstring* const m_string_table[] = {
-    (const bstring *)&be_const_str_PART_MAIN,
-    (const bstring *)&be_const_str__def,
-    (const bstring *)&be_const_str__X2C,
-    (const bstring *)&be_const_str_add_fast_loop,
-    NULL,
-    (const bstring *)&be_const_str_begin,
-    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E,
-    (const bstring *)&be_const_str_json,
-    (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E,
-    (const bstring *)&be_const_str_resp_cmnd_done,
-    (const bstring *)&be_const_str__X23preinit_X2Ebe,
-    (const bstring *)&be_const_str__global_def,
-    (const bstring *)&be_const_str_point,
-    (const bstring *)&be_const_str_autorun,
-    (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29,
-    (const bstring *)&be_const_str__X2Etapp,
-    NULL,
-    (const bstring *)&be_const_str_io_error,
-    (const bstring *)&be_const_str__X2502d_X25s_X2502d,
-    (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i,
-    (const bstring *)&be_const_str_point_arr,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_register_button_encoder,
-    (const bstring *)&be_const_str_push_path,
-    (const bstring *)&be_const_str_,
-    (const bstring *)&be_const_str_draw_line_dsc,
-    (const bstring *)&be_const_str_floor,
-    (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
-    (const bstring *)&be_const_str_fromb64,
-    (const bstring *)&be_const_str_argument_X20must_X20be_X20a_X20list,
-    (const bstring *)&be_const_str_get_light,
-    (const bstring *)&be_const_str_SERIAL_5E2,
-    (const bstring *)&be_const_str_RES_OK,
-    (const bstring *)&be_const_str__X3E,
-    (const bstring *)&be_const_str_percentage,
-    (const bstring *)&be_const_str_rule,
-    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files,
-    (const bstring *)&be_const_str_pi,
-    (const bstring *)&be_const_str_addr,
-    (const bstring *)&be_const_str__error,
-    NULL,
-    (const bstring *)&be_const_str_base_class,
-    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker,
-    (const bstring *)&be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29,
-    (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29,
-    (const bstring *)&be_const_str_list,
-    (const bstring *)&be_const_str_getbits,
-    (const bstring *)&be_const_str__X23init_X2Ebat,
-    (const bstring *)&be_const_str_file,
-    (const bstring *)&be_const_str_AudioFileSourceFS,
-    (const bstring *)&be_const_str_eth,
-    (const bstring *)&be_const_str_abs,
-    (const bstring *)&be_const_str__request_from,
-    (const bstring *)&be_const_str_get_bat_charge_current,
-    (const bstring *)&be_const_str_EC_C25519,
-    (const bstring *)&be_const_str_run_bat,
-    (const bstring *)&be_const_str_OPTION_A,
-    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
-    (const bstring *)&be_const_str_consume_silence,
-    (const bstring *)&be_const_str_delete_all_configs,
-    (const bstring *)&be_const_str__X3D_X3D,
-    (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range,
-    (const bstring *)&be_const_str_font_montserrat,
-    (const bstring *)&be_const_str__p,
-    (const bstring *)&be_const_str_wd,
-    (const bstring *)&be_const_str__X23autoexec_X2Ebe,
-    (const bstring *)&be_const_str__X28_X29,
-    (const bstring *)&be_const_str_set_useragent,
-    (const bstring *)&be_const_str_send_multicast,
-    (const bstring *)&be_const_str_content_stop,
-    (const bstring *)&be_const_str_coord_arr,
-    (const bstring *)&be_const_str__,
-    (const bstring *)&be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str__timers,
-    (const bstring *)&be_const_str__X3C,
-    (const bstring *)&be_const_str_find_op,
-    (const bstring *)&be_const_str_set,
-    NULL,
-    (const bstring *)&be_const_str_r,
-    (const bstring *)&be_const_str_font_seg7,
-    (const bstring *)&be_const_str_height_def,
-    NULL,
-    (const bstring *)&be_const_str__end_transmission,
-    (const bstring *)&be_const_str__X20,
-    (const bstring *)&be_const_str_set_xy,
-    (const bstring *)&be_const_str_exec_tele,
-    (const bstring *)&be_const_str_EXTERNAL_I2S,
-    (const bstring *)&be_const_str_color,
-    (const bstring *)&be_const_str__drivers,
-    (const bstring *)&be_const_str_class_init_obj,
-    (const bstring *)&be_const_str_remote_port,
-    (const bstring *)&be_const_str_json_fdump_list,
-    (const bstring *)&be_const_str_I2C_Driver,
-    (const bstring *)&be_const_str_lv_wifi_bars_icon,
-    (const bstring *)&be_const_str_EVENT_DELETE,
-    (const bstring *)&be_const_str___upper__,
-    (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20,
-    NULL,
-    (const bstring *)&be_const_str_rand,
-    (const bstring *)&be_const_str__X2B,
-    (const bstring *)&be_const_str_setmember,
-    (const bstring *)&be_const_str_SERIAL_6N1,
-    (const bstring *)&be_const_str_INTERNAL_DAC,
-    NULL,
-    (const bstring *)&be_const_str_digital_write,
-    (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str__X2Ep,
-    (const bstring *)&be_const_str_COLOR_WHITE,
-    (const bstring *)&be_const_str_content_flush,
-    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E,
-    (const bstring *)&be_const_str_RGBCT,
-    (const bstring *)&be_const_str_before_del,
-    (const bstring *)&be_const_str__X3D_X3C_X3E_X21,
-    (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem,
-    (const bstring *)&be_const_str_public_key,
-    (const bstring *)&be_const_str_widget_width_def,
-    (const bstring *)&be_const_str_CFG_X3A_X20No_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found,
-    (const bstring *)&be_const_str_erase,
-    (const bstring *)&be_const_str_COLOR_BLACK,
-    (const bstring *)&be_const_str_available,
-    (const bstring *)&be_const_str__X2Ep2,
-    (const bstring *)&be_const_str_set_chg_current,
-    (const bstring *)&be_const_str_CT,
-    (const bstring *)&be_const_str_cb_event_closure,
-    (const bstring *)&be_const_str_HTTP_POST,
-    (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str_widget_cb,
-    NULL,
-    (const bstring *)&be_const_str_Wire,
-    NULL,
-    (const bstring *)&be_const_str_size,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str__X0A,
-    NULL,
-    (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d,
-    (const bstring *)&be_const_str__X2F_X3Frst_X3D,
-    (const bstring *)&be_const_str_SERIAL_8O1,
-    (const bstring *)&be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str_add_driver,
-    (const bstring *)&be_const_str_math,
-    (const bstring *)&be_const_str_minute,
-    (const bstring *)&be_const_str_SERIAL_8N2,
-    (const bstring *)&be_const_str_count,
-    (const bstring *)&be_const_str__settings_def,
-    (const bstring *)&be_const_str__t,
-    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E,
-    (const bstring *)&be_const_str_escape,
-    (const bstring *)&be_const_str_CFG_X3A_X20running_X20,
-    (const bstring *)&be_const_str_content_send,
-    NULL,
-    (const bstring *)&be_const_str_imax,
-    (const bstring *)&be_const_str_alternate,
-    (const bstring *)&be_const_str_due,
-    (const bstring *)&be_const_str_EVENT_DRAW_MAIN,
-    (const bstring *)&be_const_str_SERIAL_5N1,
-    (const bstring *)&be_const_str_cb_do_nothing,
-    (const bstring *)&be_const_str_BRY_X3A_X20argument_X20must_X20be_X20a_X20function,
-    (const bstring *)&be_const_str_animate,
-    (const bstring *)&be_const_str__rules,
-    (const bstring *)&be_const_str_v,
-    (const bstring *)&be_const_str_AudioFileSource,
-    (const bstring *)&be_const_str_get_alternate,
-    (const bstring *)&be_const_str_Restart_X201,
-    (const bstring *)&be_const_str_load_templates,
-    (const bstring *)&be_const_str_AudioGenerator,
-    (const bstring *)&be_const_str_SERIAL_6E2,
-    (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson,
-    (const bstring *)&be_const_str_lv_coord_arr,
-    (const bstring *)&be_const_str_listdir,
-    (const bstring *)&be_const_str_set_bri,
-    (const bstring *)&be_const_str__archive,
-    (const bstring *)&be_const_str_clock_icon,
-    (const bstring *)&be_const_str__X3E_X3D,
-    (const bstring *)&be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D,
-    (const bstring *)&be_const_str_duration,
-    (const bstring *)&be_const_str_loop,
-    (const bstring *)&be_const_str__energy,
-    NULL,
-    (const bstring *)&be_const_str_OpusDecoder,
-    NULL,
-    (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B,
-    NULL,
-    (const bstring *)&be_const_str_set_text,
-    (const bstring *)&be_const_str__X2E_X2E,
-    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20,
-    NULL,
-    (const bstring *)&be_const_str_get_style_pad_right,
-    (const bstring *)&be_const_str_select,
-    (const bstring *)&be_const_str_INTERNAL_PDM,
-    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
-    (const bstring *)&be_const_str_reset,
-    NULL,
-    (const bstring *)&be_const_str_set_auth,
-    (const bstring *)&be_const_str_SERIAL_8E1,
-    (const bstring *)&be_const_str_compress,
-    (const bstring *)&be_const_str__persist_X2Ejson,
-    (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf,
-    (const bstring *)&be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus,
-    (const bstring *)&be_const_str_ctypes_bytes_dyn,
-    (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E,
-    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20,
-    (const bstring *)&be_const_str_acos,
-    NULL,
-    (const bstring *)&be_const_str__X2Ew,
-    (const bstring *)&be_const_str_SERIAL_7N2,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str__X23display_X2Eini,
-    (const bstring *)&be_const_str_set_mode_rgb,
-    (const bstring *)&be_const_str_EVENT_DRAW_PART_END,
-    (const bstring *)&be_const_str_allocated,
-    (const bstring *)&be_const_str_detect,
-    (const bstring *)&be_const_str_editable,
-    (const bstring *)&be_const_str_connection_error,
-    (const bstring *)&be_const_str_AudioGeneratorWAV,
-    (const bstring *)&be_const_str___iterator__,
-    (const bstring *)&be_const_str_set_alternate,
-    (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_seg7_font,
-    (const bstring *)&be_const_str_write_gpio,
-    (const bstring *)&be_const_str_tomap,
-    (const bstring *)&be_const_str_add,
-    (const bstring *)&be_const_str_every_100ms,
-    (const bstring *)&be_const_str_c,
-    (const bstring *)&be_const_str_find,
-    (const bstring *)&be_const_str_add_anim,
-    (const bstring *)&be_const_str_widget_editable,
-    NULL,
-    (const bstring *)&be_const_str_widget_event,
-    (const bstring *)&be_const_str_isinstance,
-    NULL,
-    (const bstring *)&be_const_str_toupper,
-    (const bstring *)&be_const_str_init_draw_line_dsc,
-    (const bstring *)&be_const_str_instance,
-    (const bstring *)&be_const_str_stop_iteration,
-    (const bstring *)&be_const_str_p1,
-    (const bstring *)&be_const_str_atleast1,
-    (const bstring *)&be_const_str_depower,
-    NULL,
-    (const bstring *)&be_const_str_decode,
-    (const bstring *)&be_const_str_read_sensors,
-    NULL,
-    (const bstring *)&be_const_str_BUTTON_CONFIGURATION,
-    NULL,
-    (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D,
-    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str_exec_rules,
-    NULL,
-    (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E,
-    (const bstring *)&be_const_str_Leds,
-    (const bstring *)&be_const_str_STATE_DEFAULT,
-    (const bstring *)&be_const_str__X3F,
-    (const bstring *)&be_const_str_y1,
-    (const bstring *)&be_const_str_AudioGeneratorMP3,
-    (const bstring *)&be_const_str_calldepth,
-    (const bstring *)&be_const_str_Tasmota,
-    (const bstring *)&be_const_str_autoexec,
-    (const bstring *)&be_const_str_content_send_style,
-    (const bstring *)&be_const_str__X21_X3D_X3D,
-    (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20,
-    (const bstring *)&be_const_str__X23,
-    NULL,
-    (const bstring *)&be_const_str_imin,
-    (const bstring *)&be_const_str_display,
-    (const bstring *)&be_const_str_a,
-    (const bstring *)&be_const_str_SK6812_GRBW,
-    NULL,
-    (const bstring *)&be_const_str_read8,
-    (const bstring *)&be_const_str_set_percentage,
-    (const bstring *)&be_const_str_BRY_X3A_X20method_X20not_X20allowed_X2C_X20use_X20a_X20closure_X20like_X20_X27_X2F_X20args_X20_X2D_X3E_X20obj_X2Efunc_X28args_X29_X27,
-    (const bstring *)&be_const_str_Parameter_X20error,
-    (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str_except,
-    (const bstring *)&be_const_str_lv_clock_icon,
-    (const bstring *)&be_const_str_json_fdump_map,
-    (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E,
-    (const bstring *)&be_const_str_unknown_X20instruction,
-    (const bstring *)&be_const_str_AudioOutputI2S,
-    (const bstring *)&be_const_str_consume_stereo,
-    (const bstring *)&be_const_str_find_key_i,
-    NULL,
-    (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting,
-    (const bstring *)&be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function,
-    (const bstring *)&be_const_str_check_not_method,
-    (const bstring *)&be_const_str__X2C_X22AXP192_X22_X3A_X7B_X22VBusVoltage_X22_X3A_X25_X2E3f_X2C_X22VBusCurrent_X22_X3A_X25_X2E1f_X2C_X22BattVoltage_X22_X3A_X25_X2E3f_X2C_X22BattCurrent_X22_X3A_X25_X2E1f_X2C_X22Temperature_X22_X3A_X25_X2E1f_X7D,
-    (const bstring *)&be_const_str_persist,
-    (const bstring *)&be_const_str__X2Fac,
-    (const bstring *)&be_const_str_get_cb_list,
-    NULL,
-    (const bstring *)&be_const_str_SERIAL_5N2,
     (const bstring *)&be_const_str__X3D,
+    (const bstring *)&be_const_str_closure,
+    (const bstring *)&be_const_str_constructor_cb,
+    (const bstring *)&be_const_str_consume_mono,
+    (const bstring *)&be_const_str_class_init_obj,
+    (const bstring *)&be_const_str_detected_X20on_X20bus,
+    (const bstring *)&be_const_str__global_def,
     NULL,
-    (const bstring *)&be_const_str_group_def,
+    (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29,
+    (const bstring *)&be_const_str_INTERNAL_DAC,
+    (const bstring *)&be_const_str__drivers,
+    (const bstring *)&be_const_str_find_key_i,
     (const bstring *)&be_const_str_concat,
     NULL,
-    (const bstring *)&be_const_str__X2Ep1,
-    (const bstring *)&be_const_str_signal_bars,
-    (const bstring *)&be_const_str_bri,
-    (const bstring *)&be_const_str_WS2812_GRB,
+    (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20,
     NULL,
-    (const bstring *)&be_const_str__X2Esize,
-    (const bstring *)&be_const_str_page_autoconf_mgr,
-    (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B,
+    (const bstring *)&be_const_str_call,
+    (const bstring *)&be_const_str__X23autoexec_X2Ebat,
+    (const bstring *)&be_const_str__X23,
+    NULL,
+    (const bstring *)&be_const_str_p2,
+    (const bstring *)&be_const_str_close,
+    (const bstring *)&be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29,
+    (const bstring *)&be_const_str_lv_point_arr,
+    (const bstring *)&be_const_str_read,
+    (const bstring *)&be_const_str_a,
+    NULL,
+    (const bstring *)&be_const_str__X23init_X2Ebat,
+    (const bstring *)&be_const_str_allocated,
+    (const bstring *)&be_const_str_GET,
+    NULL,
+    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E,
+    (const bstring *)&be_const_str_range,
+    (const bstring *)&be_const_str__X2F_X2Eautoconf,
+    (const bstring *)&be_const_str_update,
+    (const bstring *)&be_const_str__filename,
+    (const bstring *)&be_const_str_page_autoconf_ctl,
+    (const bstring *)&be_const_str_SERIAL_5O1,
+    (const bstring *)&be_const_str_SERIAL_8O2,
+    (const bstring *)&be_const_str_shared_key,
+    (const bstring *)&be_const_str_None,
+    (const bstring *)&be_const_str__begin_transmission,
+    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker,
     NULL,
     NULL,
-    (const bstring *)&be_const_str_add_rule,
-    (const bstring *)&be_const_str_encrypt,
-    (const bstring *)&be_const_str_animators,
+    (const bstring *)&be_const_str_area,
+    (const bstring *)&be_const_str_get_free_heap,
+    (const bstring *)&be_const_str_get_current_module_path,
+    (const bstring *)&be_const_str_AudioOutputI2S,
     NULL,
-    (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson,
-    (const bstring *)&be_const_str_arg,
-    (const bstring *)&be_const_str_SERIAL_5O2,
-    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E,
-    (const bstring *)&be_const_str_SERIAL_7O2,
-    (const bstring *)&be_const_str_ins_time,
-    (const bstring *)&be_const_str__X2Ebe,
-    (const bstring *)&be_const_str_add_handler,
-    (const bstring *)&be_const_str_widget_struct_default,
-    (const bstring *)&be_const_str___lower__,
-    (const bstring *)&be_const_str_gamma,
-    (const bstring *)&be_const_str_arg_name,
-    (const bstring *)&be_const_str_tob64,
-    (const bstring *)&be_const_str_hex,
-    (const bstring *)&be_const_str_TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27,
-    (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29,
-    (const bstring *)&be_const_str__X2Eautoconf,
-    (const bstring *)&be_const_str_serial,
-    (const bstring *)&be_const_str_counters,
-    (const bstring *)&be_const_str_SERIAL_8E2,
-    (const bstring *)&be_const_str_I2C_X3A,
-    (const bstring *)&be_const_str__X2Elen,
+    NULL,
+    (const bstring *)&be_const_str__settings_def,
+    (const bstring *)&be_const_str_remove_rule,
+    NULL,
+    (const bstring *)&be_const_str_SERIAL_5N1,
+    (const bstring *)&be_const_str_CFG_X3A_X20No_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found,
+    (const bstring *)&be_const_str_arg_size,
+    (const bstring *)&be_const_str__X2E,
+    (const bstring *)&be_const_str_global,
+    (const bstring *)&be_const_str_collect,
+    (const bstring *)&be_const_str_add_fast_loop,
+    (const bstring *)&be_const_str_SERIAL_6E2,
+    (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
+    (const bstring *)&be_const_str_add_cmd,
+    (const bstring *)&be_const_str_lv_clock_icon,
+    (const bstring *)&be_const_str_get_vbus_voltage,
+    (const bstring *)&be_const_str_deinit,
+    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20,
+    (const bstring *)&be_const_str_cmd,
+    (const bstring *)&be_const_str_light,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_check_not_method,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
+    (const bstring *)&be_const_str_attrdump,
+    (const bstring *)&be_const_str_preinit,
+    (const bstring *)&be_const_str__X21_X3D,
+    (const bstring *)&be_const_str_alternate,
+    (const bstring *)&be_const_str_rule,
+    (const bstring *)&be_const_str_Auto_X2Dconfiguration,
+    (const bstring *)&be_const_str_public_key,
+    (const bstring *)&be_const_str_set_chg_current,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_delay,
+    (const bstring *)&be_const_str_decompress,
+    (const bstring *)&be_const_str__dirty,
+    (const bstring *)&be_const_str_BRY_X3A_X20method_X20not_X20allowed_X2C_X20use_X20a_X20closure_X20like_X20_X27_X2F_X20args_X20_X2D_X3E_X20obj_X2Efunc_X28args_X29_X27,
+    (const bstring *)&be_const_str_STATE_DEFAULT,
+    (const bstring *)&be_const_str__X3C,
+    (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i,
+    (const bstring *)&be_const_str_param,
+    (const bstring *)&be_const_str__X2F_X3Frst_X3D,
+    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20,
+    (const bstring *)&be_const_str_SERIAL_6O2,
+    (const bstring *)&be_const_str_ceil,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_tasmota,
+    (const bstring *)&be_const_str_engine,
+    NULL,
+    (const bstring *)&be_const_str_end,
+    (const bstring *)&be_const_str_pc,
     NULL,
     (const bstring *)&be_const_str_DIMMER,
-    (const bstring *)&be_const_str_engine,
-    (const bstring *)&be_const_str_MD5,
-    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
-    (const bstring *)&be_const_str_set_ct,
-    (const bstring *)&be_const_str_assert,
-    (const bstring *)&be_const_str_reapply,
-    (const bstring *)&be_const_str_wire_scan,
-    (const bstring *)&be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map,
-    (const bstring *)&be_const_str_SERIAL_6E1,
+    (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_init,
+    (const bstring *)&be_const_str__timers,
+    (const bstring *)&be_const_str_pixels_buffer,
     (const bstring *)&be_const_str__ccmd,
-    (const bstring *)&be_const_str_SERIAL_6O1,
-    (const bstring *)&be_const_str_lower,
-    (const bstring *)&be_const_str_lvgl_event_dispatch,
+    (const bstring *)&be_const_str_create_segment,
+    (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29,
+    (const bstring *)&be_const_str_SERIAL_8E1,
+    (const bstring *)&be_const_str_cb_do_nothing,
+    (const bstring *)&be_const_str_Parameter_X20error,
+    (const bstring *)&be_const_str_imin,
+    (const bstring *)&be_const_str_set_mode_ct,
     NULL,
-    (const bstring *)&be_const_str__X3A,
-    (const bstring *)&be_const_str_lv_wifi_arcs_icon,
-    (const bstring *)&be_const_str_debug,
-    (const bstring *)&be_const_str_instance_X20required,
-    (const bstring *)&be_const_str_x,
-    (const bstring *)&be_const_str_pc_rel,
-    (const bstring *)&be_const_str_SERIAL_8O2,
-    (const bstring *)&be_const_str_map,
-    (const bstring *)&be_const_str_every_50ms,
-    (const bstring *)&be_const_str__X23autoexec_X2Ebat,
-    (const bstring *)&be_const_str__X25s_X2Eautoconf,
-    (const bstring *)&be_const_str_SERIAL_6N2,
+    (const bstring *)&be_const_str__cmd,
+    (const bstring *)&be_const_str_rad,
+    (const bstring *)&be_const_str_SERIAL_7E2,
+    (const bstring *)&be_const_str_introspect,
+    (const bstring *)&be_const_str_function,
+    (const bstring *)&be_const_str_OneWire,
+    (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str_write_file,
+    (const bstring *)&be_const_str_animate,
+    (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d,
+    (const bstring *)&be_const_str_SERIAL_8O1,
+    (const bstring *)&be_const_str_AudioFileSourceFS,
+    (const bstring *)&be_const_str_SERIAL_5E2,
+    (const bstring *)&be_const_str_light_state,
+    (const bstring *)&be_const_str_exec_tele,
+    (const bstring *)&be_const_str_MD5,
     NULL,
-    (const bstring *)&be_const_str__X21_X3D,
-    (const bstring *)&be_const_str_cos,
-    (const bstring *)&be_const_str_null_cb,
-    (const bstring *)&be_const_str_fromptr,
+    (const bstring *)&be_const_str_cosh,
+    (const bstring *)&be_const_str_acos,
+    (const bstring *)&be_const_str__def,
+    (const bstring *)&be_const_str_SERIAL_7N2,
+    (const bstring *)&be_const_str_delete_all_configs,
     NULL,
+    (const bstring *)&be_const_str__X3D_X3D,
+    (const bstring *)&be_const_str_get_style_bg_color,
+    (const bstring *)&be_const_str_str,
+    (const bstring *)&be_const_str_cb,
+    (const bstring *)&be_const_str_draw_arc_dsc_init,
+    (const bstring *)&be_const_str_get_aps_voltage,
+    (const bstring *)&be_const_str_RGBCT,
+    (const bstring *)&be_const_str_lv_,
+    (const bstring *)&be_const_str_byte,
+    (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN,
+    (const bstring *)&be_const_str__class,
+    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
     NULL,
-    (const bstring *)&be_const_str_detected_X20on_X20bus,
-    (const bstring *)&be_const_str_matrix,
-    (const bstring *)&be_const_str_print,
-    (const bstring *)&be_const_str_Auto_X2Dconfiguration,
+    (const bstring *)&be_const_str_invalidate,
+    (const bstring *)&be_const_str__request_from,
+    NULL,
+    (const bstring *)&be_const_str_page_autoconf_mgr,
+    (const bstring *)&be_const_str__X2Ep2,
+    (const bstring *)&be_const_str_decrypt,
+    (const bstring *)&be_const_str_issubclass,
+    (const bstring *)&be_const_str__rules,
+    (const bstring *)&be_const_str_add_driver,
+    (const bstring *)&be_const_str_get_power,
+    (const bstring *)&be_const_str_consume_stereo,
+    (const bstring *)&be_const_str_getbits,
+    (const bstring *)&be_const_str_begin,
     NULL,
-    (const bstring *)&be_const_str_resp_cmnd_str,
     (const bstring *)&be_const_str_Timer,
-    (const bstring *)&be_const_str_LVG_X3A_X20object_X3A,
-    (const bstring *)&be_const_str_internal_error,
+    (const bstring *)&be_const_str__persist_X2Ejson,
+    NULL,
+    (const bstring *)&be_const_str_Restart_X201,
+    (const bstring *)&be_const_str__X3C_X3D,
+    (const bstring *)&be_const_str__X5D,
+    (const bstring *)&be_const_str_I2C_Driver,
+    (const bstring *)&be_const_str__X25s_X2Eautoconf,
+    (const bstring *)&be_const_str_SERIAL_5O2,
+    (const bstring *)&be_const_str_RGBW,
+    (const bstring *)&be_const_str_rotate,
+    (const bstring *)&be_const_str__X3F,
+    (const bstring *)&be_const_str_get_string,
+    (const bstring *)&be_const_str_pop,
+    (const bstring *)&be_const_str_io_error,
+    NULL,
+    (const bstring *)&be_const_str_set_power,
+    (const bstring *)&be_const_str_has_X20already_X20an_X20event_X20callback,
+    (const bstring *)&be_const_str_get,
+    (const bstring *)&be_const_str_print,
+    (const bstring *)&be_const_str_WS2812_GRB,
+    (const bstring *)&be_const_str___upper__,
+    (const bstring *)&be_const_str_fromb64,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_classof,
+    (const bstring *)&be_const_str_check_privileged_access,
+    (const bstring *)&be_const_str__X21_X3D_X3D,
+    (const bstring *)&be_const_str__X2E_X2E,
+    (const bstring *)&be_const_str__X23preinit_X2Ebe,
+    (const bstring *)&be_const_str_calldepth,
+    (const bstring *)&be_const_str___iterator__,
+    (const bstring *)&be_const_str_round_start,
+    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
+    (const bstring *)&be_const_str_SERIAL_6N1,
+    (const bstring *)&be_const_str_display,
+    (const bstring *)&be_const_str_c,
+    NULL,
+    (const bstring *)&be_const_str_Leds,
+    (const bstring *)&be_const_str_gc,
+    NULL,
+    (const bstring *)&be_const_str_instance,
+    (const bstring *)&be_const_str_counters,
+    (const bstring *)&be_const_str_every_second,
+    (const bstring *)&be_const_str__global_addr,
+    (const bstring *)&be_const_str_can_show,
+    (const bstring *)&be_const_str__X2Eautoconf,
+    (const bstring *)&be_const_str_CFG_X3A_X20running_X20,
+    (const bstring *)&be_const_str__X23display_X2Eini,
+    (const bstring *)&be_const_str_files,
+    (const bstring *)&be_const_str_flush,
+    (const bstring *)&be_const_str__X3A,
+    (const bstring *)&be_const_str_add_handler,
+    NULL,
+    (const bstring *)&be_const_str__X3E_X3D,
+    (const bstring *)&be_const_str_kv,
+    (const bstring *)&be_const_str_load_templates,
+    (const bstring *)&be_const_str_get_alternate,
+    (const bstring *)&be_const_str_x,
+    (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E,
+    (const bstring *)&be_const_str_stop,
+    (const bstring *)&be_const_str_atan2,
+    NULL,
+    (const bstring *)&be_const_str_get_current_module_name,
+    (const bstring *)&be_const_str_get_style_pad_right,
+    (const bstring *)&be_const_str_SERIAL_6O1,
+    (const bstring *)&be_const_str__buffer,
+    (const bstring *)&be_const_str_atan,
     (const bstring *)&be_const_str__write,
-    (const bstring *)&be_const_str_w,
-    (const bstring *)&be_const_str_connect,
-    (const bstring *)&be_const_str_Unknown_X20command,
-    (const bstring *)&be_const_str_collect,
-    (const bstring *)&be_const_str_SERIAL_7N1,
-    (const bstring *)&be_const_str_format,
-    (const bstring *)&be_const_str_ismethod,
-    (const bstring *)&be_const_str_cmd_res,
+    (const bstring *)&be_const_str__X28_X29,
+    (const bstring *)&be_const_str_enabled,
+    (const bstring *)&be_const_str_AudioGeneratorMP3,
+    (const bstring *)&be_const_str_lv_wifi_arcs_icon,
+    (const bstring *)&be_const_str_call_native,
+    (const bstring *)&be_const_str_,
+    (const bstring *)&be_const_str_event_send,
+    (const bstring *)&be_const_str_file,
+    (const bstring *)&be_const_str__X2Esize,
+    (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson,
+    (const bstring *)&be_const_str__X2Ep1,
+    (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20,
+    (const bstring *)&be_const_str_AudioGeneratorWAV,
+    (const bstring *)&be_const_str_OpusDecoder,
+    (const bstring *)&be_const_str_arg_name,
+    (const bstring *)&be_const_str_button_pressed,
+    (const bstring *)&be_const_str_open,
+    (const bstring *)&be_const_str__X3Clambda_X3E,
+    (const bstring *)&be_const_str_copy,
+    (const bstring *)&be_const_str_SERIAL_8N1,
+    (const bstring *)&be_const_str_POST,
+    (const bstring *)&be_const_str_return,
     NULL,
-    (const bstring *)&be_const_str__X5B,
-    (const bstring *)&be_const_str_pc_abs,
-    NULL,
-    (const bstring *)&be_const_str_Tele,
-    (const bstring *)&be_const_str_is_first_time,
+    (const bstring *)&be_const_str_editable,
+    (const bstring *)&be_const_str_RGB,
+    (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range,
+    (const bstring *)&be_const_str_static,
+    (const bstring *)&be_const_str_AES_GCM,
+    (const bstring *)&be_const_str_EXTERNAL_I2S,
+    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E,
+    (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D,
+    (const bstring *)&be_const_str__X3E,
+    (const bstring *)&be_const_str_finish,
+    (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem,
+    (const bstring *)&be_const_str_get_bat_charge_current,
+    (const bstring *)&be_const_str_draw_arc,
+    (const bstring *)&be_const_str_get_style_line_color,
+    (const bstring *)&be_const_str_get_log,
+    (const bstring *)&be_const_str_content_send,
+    (const bstring *)&be_const_str_COLOR_WHITE,
+    (const bstring *)&be_const_str_id,
+    (const bstring *)&be_const_str_LVG_X3A_X20object_X3A,
+    (const bstring *)&be_const_str_lv_event,
+    (const bstring *)&be_const_str_isnan,
+    (const bstring *)&be_const_str_abs,
     (const bstring *)&be_const_str__X2508x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2D_X2504x_X2508x,
-    (const bstring *)&be_const_str_iter,
+    (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str__X2Ebe,
+    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E,
+    (const bstring *)&be_const_str__X2C,
+    (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29,
+    (const bstring *)&be_const_str__fl,
+    (const bstring *)&be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27,
+    NULL,
+    (const bstring *)&be_const_str_detect,
+    (const bstring *)&be_const_str_arg,
+    (const bstring *)&be_const_str_b,
+    (const bstring *)&be_const_str_draw_line_dsc,
+    (const bstring *)&be_const_str_HTTP_POST,
+    (const bstring *)&be_const_str_ismethod,
+    (const bstring *)&be_const_str_var,
+    NULL,
+    (const bstring *)&be_const_str_AudioFileSource,
+    (const bstring *)&be_const_str_offseta,
+    NULL,
+    (const bstring *)&be_const_str__X23autoexec_X2Ebe,
+    (const bstring *)&be_const_str_autorun,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3EAuto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_widget_ctor_impl,
+    (const bstring *)&be_const_str_tob64,
+    (const bstring *)&be_const_str_log,
+    (const bstring *)&be_const_str_get_vbus_current,
+    (const bstring *)&be_const_str_HTTP_GET,
+    (const bstring *)&be_const_str_count,
+    (const bstring *)&be_const_str__end_transmission,
+    (const bstring *)&be_const_str__anonymous_,
+    (const bstring *)&be_const_str_SK6812_GRBW,
+    (const bstring *)&be_const_str_WS2812,
+    (const bstring *)&be_const_str_base_class,
+    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files,
+    (const bstring *)&be_const_str__X2Elen,
+    (const bstring *)&be_const_str_int,
+    (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E,
+    NULL,
+    (const bstring *)&be_const_str_set_width,
+    (const bstring *)&be_const_str__X2Ebec,
+    (const bstring *)&be_const_str_SERIAL_5N2,
+    (const bstring *)&be_const_str_path,
+    (const bstring *)&be_const_str_persist,
+    (const bstring *)&be_const_str__X2B,
+    (const bstring *)&be_const_str_zip,
+    (const bstring *)&be_const_str_arch,
+    (const bstring *)&be_const_str_lv_wifi_arcs,
+    (const bstring *)&be_const_str_content_start,
+    (const bstring *)&be_const_str_json_fdump,
+    (const bstring *)&be_const_str__ptr,
+    NULL,
+    (const bstring *)&be_const_str_offset,
+    (const bstring *)&be_const_str__X20,
+    (const bstring *)&be_const_str_pin_mode,
+    (const bstring *)&be_const_str__t,
+    (const bstring *)&be_const_str_cmd_res,
+    (const bstring *)&be_const_str_digital_read,
+    (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
     (const bstring *)&be_const_str_bytes,
-    (const bstring *)&be_const_str__X2F_X2Eautoconf,
-    (const bstring *)&be_const_str__read
+    (const bstring *)&be_const_str_f,
+    (const bstring *)&be_const_str_pin_used,
+    (const bstring *)&be_const_str_BRY_X3A_X20argument_X20must_X20be_X20a_X20function,
+    (const bstring *)&be_const_str_SERIAL_8N2,
+    (const bstring *)&be_const_str_gamma8,
+    (const bstring *)&be_const_str_find_op,
+    (const bstring *)&be_const_str_out_X20of_X20range,
+    (const bstring *)&be_const_str_get_option,
+    NULL,
+    (const bstring *)&be_const_str__,
+    (const bstring *)&be_const_str_get_object_from_ptr,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_EVENT_DRAW_MAIN,
+    (const bstring *)&be_const_str_rand,
+    (const bstring *)&be_const_str_codedump,
+    (const bstring *)&be_const_str_dac_voltage,
+    (const bstring *)&be_const_str_resp_cmnd_error,
+    (const bstring *)&be_const_str_elements_X20must_X20be_X20a_X20lv_point,
+    (const bstring *)&be_const_str_TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str_False,
+    (const bstring *)&be_const_str_elif,
+    NULL,
+    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E,
+    (const bstring *)&be_const_str_nan,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
+    (const bstring *)&be_const_str_connected,
+    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B,
+    (const bstring *)&be_const_str_cb_event_closure,
+    (const bstring *)&be_const_str_I2C_X3A,
+    (const bstring *)&be_const_str_AudioGenerator,
+    (const bstring *)&be_const_str_tr,
+    (const bstring *)&be_const_str__X2Ew,
+    NULL,
+    (const bstring *)&be_const_str_True,
+    (const bstring *)&be_const_str_pi,
+    (const bstring *)&be_const_str_SERIAL_8E2,
+    (const bstring *)&be_const_str_exec_cmd,
+    (const bstring *)&be_const_str_set_time,
+    (const bstring *)&be_const_str__X2C_X22AXP192_X22_X3A_X7B_X22VBusVoltage_X22_X3A_X25_X2E3f_X2C_X22VBusCurrent_X22_X3A_X25_X2E1f_X2C_X22BattVoltage_X22_X3A_X25_X2E3f_X2C_X22BattCurrent_X22_X3A_X25_X2E1f_X2C_X22Temperature_X22_X3A_X25_X2E1f_X7D,
+    (const bstring *)&be_const_str_solidified,
+    NULL,
+    (const bstring *)&be_const_str_input,
+    (const bstring *)&be_const_str_tostring,
+    (const bstring *)&be_const_str_SERIAL_7E1,
+    (const bstring *)&be_const_str__X2502d_X25s_X2502d,
+    (const bstring *)&be_const_str_ctor,
+    NULL,
+    (const bstring *)&be_const_str_encrypt,
+    (const bstring *)&be_const_str_display_X2Eini,
+    (const bstring *)&be_const_str_set_pwm,
+    (const bstring *)&be_const_str_web_add_button,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_AudioOutput,
+    (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E,
+    (const bstring *)&be_const_str_is_dirty,
+    (const bstring *)&be_const_str__X0A,
+    (const bstring *)&be_const_str_cb_obj,
+    (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B,
+    (const bstring *)&be_const_str__X2Etapp
 };
 
 static const struct bconststrtab m_const_string_table = {
-    .size = 401,
-    .count = 825,
+    .size = 405,
+    .count = 834,
     .table = m_string_table
 };
diff --git a/lib/libesp32/berry/generate/be_fixed_be_class_tasmota_log_reader.h b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota_log_reader.h
new file mode 100644
index 000000000..b922bf421
--- /dev/null
+++ b/lib/libesp32/berry/generate/be_fixed_be_class_tasmota_log_reader.h
@@ -0,0 +1,19 @@
+#include "be_constobj.h"
+
+static be_define_const_map_slots(be_class_tasmota_log_reader_map) {
+    { be_const_key(get_log, 1), be_const_ctype_func(tlr_get_log) },
+    { be_const_key(init, -1), be_const_ctype_func(tlr_init) },
+    { be_const_key(_p, -1), be_const_var(0) },
+};
+
+static be_define_const_map(
+    be_class_tasmota_log_reader_map,
+    3
+);
+
+BE_EXPORT_VARIABLE be_define_const_class(
+    be_class_tasmota_log_reader,
+    1,
+    NULL,
+    tasmota_log_reader
+);
diff --git a/lib/libesp32/berry/generate/be_fixed_lv_tasmota.h b/lib/libesp32/berry/generate/be_fixed_lv_tasmota.h
index 115726731..d2b1e2467 100644
--- a/lib/libesp32/berry/generate/be_fixed_lv_tasmota.h
+++ b/lib/libesp32/berry/generate/be_fixed_lv_tasmota.h
@@ -1,20 +1,21 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(m_liblv_tasmota_map) {
-    { be_const_key(seg7_font, -1), be_const_func(lv0_load_seg7_font) },
-    { be_const_key(font_seg7, -1), be_const_func(lv0_load_seg7_font) },
-    { be_const_key(start, -1), be_const_func(lv0_start) },
-    { be_const_key(font_montserrat, -1), be_const_func(lv0_load_montserrat_font) },
-    { be_const_key(montserrat_font, -1), be_const_func(lv0_load_montserrat_font) },
-    { be_const_key(load_freetype_font, -1), be_const_func(lv0_load_freetype_font) },
-    { be_const_key(init, 0), be_const_closure(lv_tasmota_init_closure) },
-    { be_const_key(screenshot, 1), be_const_func(lv0_screenshot) },
     { be_const_key(register_button_encoder, -1), be_const_func(lv0_register_button_encoder) },
+    { be_const_key(screenshot, 6), be_const_func(lv0_screenshot) },
+    { be_const_key(load_freetype_font, 8), be_const_func(lv0_load_freetype_font) },
+    { be_const_key(font_embedded, -1), be_const_func(lv0_load_font_embedded) },
+    { be_const_key(montserrat_font, -1), be_const_func(lv0_load_montserrat_font) },
+    { be_const_key(init, 7), be_const_closure(lv_tasmota_init_closure) },
+    { be_const_key(start, -1), be_const_func(lv0_start) },
+    { be_const_key(font_seg7, -1), be_const_func(lv0_load_seg7_font) },
+    { be_const_key(font_montserrat, -1), be_const_func(lv0_load_montserrat_font) },
+    { be_const_key(seg7_font, -1), be_const_func(lv0_load_seg7_font) },
 };
 
 static be_define_const_map(
     m_liblv_tasmota_map,
-    9
+    10
 );
 
 static be_define_const_module(
diff --git a/lib/libesp32/berry_mapping/src/be_class_wrapper.c b/lib/libesp32/berry_mapping/src/be_class_wrapper.c
index aa16c5ac7..7be882013 100644
--- a/lib/libesp32/berry_mapping/src/be_class_wrapper.c
+++ b/lib/libesp32/berry_mapping/src/be_class_wrapper.c
@@ -142,6 +142,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) {
  *   'f' be_real (float)
  *   'b' be_bool
  *   's' be_str
+ *   '$' be_str but the buffer must be `free()`ed
  *   '&' bytes() object, pointer to buffer returned, and size passed with an additional (size_t*) argument
  * 
  * - arg_type: optionally check the types of input arguments, or throw an error
@@ -469,7 +470,8 @@ int be_call_c_func(bvm *vm, const void * func, const char * return_type, const c
       case 'f':   be_pushreal(vm, intasreal(ret)); break;
       case 'b':   be_pushbool(vm, ret);  break;
       case 'c':   be_pushcomptr(vm, (void*) ret); break;
-      case 's':   be_pushstring(vm, (const char*) ret);  break;
+      case 's':   if (ret) {be_pushstring(vm, (const char*) ret);} else {be_pushnil(vm);} break;  // push `nil` if no string
+      case '$':   if (ret) {be_pushstring(vm, (const char*) ret);  free((void*)ret);} else {be_pushnil(vm);} break;
       case '&':   be_pushbytes(vm, (void*) ret, return_len); break;
       default:    be_raise(vm, "internal_error", "Unsupported return type"); break;
     }
diff --git a/lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c b/lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c
index 6da172c6a..afd8ba098 100644
--- a/lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c
+++ b/lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c
@@ -12,6 +12,7 @@ extern int lv0_register_button_encoder(bvm *vm);  // add buttons with encoder lo
 extern int lv0_load_montserrat_font(bvm *vm);
 extern int lv0_load_seg7_font(bvm *vm);
 extern int lv0_load_robotocondensed_latin1_font(bvm *vm);
+extern int lv0_load_font_embedded(bvm *vm);
 
 extern int lv0_screenshot(bvm *vm);
 extern int lv0_load_freetype_font(bvm *vm);
@@ -29,34 +30,35 @@ be_local_closure(lv_tasmota_init,   /* name */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[23]) {     /* constants */
+    ( &(const bvalue[24]) {     /* constants */
     /* K0   */  be_nested_str(lv),
     /* K1   */  be_nested_str(start),
     /* K2   */  be_nested_str(font_montserrat),
     /* K3   */  be_nested_str(montserrat_font),
     /* K4   */  be_nested_str(font_seg7),
     /* K5   */  be_nested_str(seg7_font),
-    /* K6   */  be_nested_str(load_freetype_font),
-    /* K7   */  be_nested_str(register_button_encoder),
-    /* K8   */  be_nested_str(screenshot),
-    /* K9   */  be_nested_str(clock_icon),
-    /* K10  */  be_nested_str(lv_clock_icon),
-    /* K11  */  be_nested_str(signal_arcs),
-    /* K12  */  be_nested_str(lv_signal_arcs),
-    /* K13  */  be_nested_str(signal_bars),
-    /* K14  */  be_nested_str(lv_signal_bars),
-    /* K15  */  be_nested_str(wifi_arcs_icon),
-    /* K16  */  be_nested_str(lv_wifi_arcs_icon),
-    /* K17  */  be_nested_str(wifi_arcs),
-    /* K18  */  be_nested_str(lv_wifi_arcs),
-    /* K19  */  be_nested_str(wifi_bars_icon),
-    /* K20  */  be_nested_str(lv_wifi_bars_icon),
-    /* K21  */  be_nested_str(wifi_bars),
-    /* K22  */  be_nested_str(lv_wifi_bars),
+    /* K6   */  be_nested_str(font_embedded),
+    /* K7   */  be_nested_str(load_freetype_font),
+    /* K8   */  be_nested_str(register_button_encoder),
+    /* K9   */  be_nested_str(screenshot),
+    /* K10  */  be_nested_str(clock_icon),
+    /* K11  */  be_nested_str(lv_clock_icon),
+    /* K12  */  be_nested_str(signal_arcs),
+    /* K13  */  be_nested_str(lv_signal_arcs),
+    /* K14  */  be_nested_str(signal_bars),
+    /* K15  */  be_nested_str(lv_signal_bars),
+    /* K16  */  be_nested_str(wifi_arcs_icon),
+    /* K17  */  be_nested_str(lv_wifi_arcs_icon),
+    /* K18  */  be_nested_str(wifi_arcs),
+    /* K19  */  be_nested_str(lv_wifi_arcs),
+    /* K20  */  be_nested_str(wifi_bars_icon),
+    /* K21  */  be_nested_str(lv_wifi_bars_icon),
+    /* K22  */  be_nested_str(wifi_bars),
+    /* K23  */  be_nested_str(lv_wifi_bars),
     }),
     &be_const_str_init,
     &be_const_str_solidified,
-    ( &(const binstruction[33]) {  /* code */
+    ( &(const binstruction[35]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0x88080101,  //  0001  GETMBR	R2	R0	K1
       0x90060202,  //  0002  SETMBR	R1	K1	R2
@@ -74,22 +76,24 @@ be_local_closure(lv_tasmota_init,   /* name */
       0x90060E02,  //  000E  SETMBR	R1	K7	R2
       0x88080108,  //  000F  GETMBR	R2	R0	K8
       0x90061002,  //  0010  SETMBR	R1	K8	R2
-      0xB80A1400,  //  0011  GETNGBL	R2	K10
+      0x88080109,  //  0011  GETMBR	R2	R0	K9
       0x90061202,  //  0012  SETMBR	R1	K9	R2
-      0xB80A1800,  //  0013  GETNGBL	R2	K12
-      0x90061602,  //  0014  SETMBR	R1	K11	R2
-      0xB80A1C00,  //  0015  GETNGBL	R2	K14
-      0x90061A02,  //  0016  SETMBR	R1	K13	R2
-      0xB80A2000,  //  0017  GETNGBL	R2	K16
-      0x90061E02,  //  0018  SETMBR	R1	K15	R2
-      0xB80A2400,  //  0019  GETNGBL	R2	K18
-      0x90062202,  //  001A  SETMBR	R1	K17	R2
-      0xB80A2800,  //  001B  GETNGBL	R2	K20
-      0x90062602,  //  001C  SETMBR	R1	K19	R2
-      0xB80A2C00,  //  001D  GETNGBL	R2	K22
-      0x90062A02,  //  001E  SETMBR	R1	K21	R2
-      0x4C080000,  //  001F  LDNIL	R2
-      0x80040400,  //  0020  RET	1	R2
+      0xB80A1600,  //  0013  GETNGBL	R2	K11
+      0x90061402,  //  0014  SETMBR	R1	K10	R2
+      0xB80A1A00,  //  0015  GETNGBL	R2	K13
+      0x90061802,  //  0016  SETMBR	R1	K12	R2
+      0xB80A1E00,  //  0017  GETNGBL	R2	K15
+      0x90061C02,  //  0018  SETMBR	R1	K14	R2
+      0xB80A2200,  //  0019  GETNGBL	R2	K17
+      0x90062002,  //  001A  SETMBR	R1	K16	R2
+      0xB80A2600,  //  001B  GETNGBL	R2	K19
+      0x90062402,  //  001C  SETMBR	R1	K18	R2
+      0xB80A2A00,  //  001D  GETNGBL	R2	K21
+      0x90062802,  //  001E  SETMBR	R1	K20	R2
+      0xB80A2E00,  //  001F  GETNGBL	R2	K23
+      0x90062C02,  //  0020  SETMBR	R1	K22	R2
+      0x4C080000,  //  0021  LDNIL	R2
+      0x80040400,  //  0022  RET	1	R2
     })
   )
 );
@@ -105,6 +109,7 @@ module lv_tasmota (scope: global) {
     montserrat_font, func(lv0_load_montserrat_font)
     font_seg7, func(lv0_load_seg7_font)
     seg7_font, func(lv0_load_seg7_font)
+    font_embedded, func(lv0_load_font_embedded)
     register_button_encoder, func(lv0_register_button_encoder)
     screenshot, func(lv0_screenshot)
 
diff --git a/lib/libesp32/berry_tasmota/src/be_lvgl_signal_arcs_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_signal_arcs_lib.c
index a127cddd9..a152adb9c 100644
--- a/lib/libesp32/berry_tasmota/src/be_lvgl_signal_arcs_lib.c
+++ b/lib/libesp32/berry_tasmota/src/be_lvgl_signal_arcs_lib.c
@@ -14,7 +14,7 @@ be_local_closure(lv_signal_arcs_set_percentage,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
@@ -59,7 +59,7 @@ be_local_closure(lv_signal_arcs_init,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     2,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
@@ -74,8 +74,8 @@ be_local_closure(lv_signal_arcs_init,   /* name */
     /* K5   */  be_nested_str(point),
     /* K6   */  be_nested_str(p2),
     /* K7   */  be_nested_str(area),
-    /* K8   */  be_nested_str(line_dsc),
-    /* K9   */  be_nested_str(draw_line_dsc),
+    /* K8   */  be_nested_str(arc_dsc),
+    /* K9   */  be_nested_str(draw_arc_dsc),
     }),
     &be_const_str_init,
     &be_const_str_solidified,
@@ -115,9 +115,9 @@ be_local_closure(lv_signal_arcs_init,   /* name */
 ********************************************************************/
 be_local_closure(lv_signal_arcs_widget_event,   /* name */
   be_nested_proto(
-    28,                          /* nstack */
+    27,                          /* nstack */
     3,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     1,                          /* has sup protos */
@@ -158,18 +158,18 @@ be_local_closure(lv_signal_arcs_widget_event,   /* name */
     /* K7   */  be_const_int(2),
     /* K8   */  be_const_int(3),
     /* K9   */  be_nested_str(EVENT_DRAW_MAIN),
-    /* K10  */  be_nested_str(area),
+    /* K10  */  be_nested_str(draw_ctx),
     /* K11  */  be_nested_str(param),
     /* K12  */  be_nested_str(get_coords),
-    /* K13  */  be_nested_str(x1),
-    /* K14  */  be_nested_str(y1),
-    /* K15  */  be_nested_str(draw_line_dsc_init),
-    /* K16  */  be_nested_str(line_dsc),
-    /* K17  */  be_nested_str(init_draw_line_dsc),
-    /* K18  */  be_nested_str(PART_MAIN),
-    /* K19  */  be_nested_str(round_start),
-    /* K20  */  be_const_int(1),
-    /* K21  */  be_nested_str(round_end),
+    /* K13  */  be_nested_str(area),
+    /* K14  */  be_nested_str(x1),
+    /* K15  */  be_nested_str(y1),
+    /* K16  */  be_nested_str(draw_arc_dsc_init),
+    /* K17  */  be_nested_str(arc_dsc),
+    /* K18  */  be_nested_str(init_draw_arc_dsc),
+    /* K19  */  be_nested_str(PART_MAIN),
+    /* K20  */  be_nested_str(rounded),
+    /* K21  */  be_const_int(1),
     /* K22  */  be_nested_str(width),
     /* K23  */  be_nested_str(get_style_line_color),
     /* K24  */  be_nested_str(STATE_DEFAULT),
@@ -186,7 +186,7 @@ be_local_closure(lv_signal_arcs_widget_event,   /* name */
     }),
     &be_const_str_widget_event,
     &be_const_str_solidified,
-    ( &(const binstruction[182]) {  /* code */
+    ( &(const binstruction[171]) {  /* code */
       0xB80E0000,  //  0000  GETNGBL	R3	K0
       0x8C0C0701,  //  0001  GETMET	R3	R3	K1
       0x5C140200,  //  0002  MOVE	R5	R1
@@ -217,158 +217,147 @@ be_local_closure(lv_signal_arcs_widget_event,   /* name */
       0xB82E0000,  //  001B  GETNGBL	R11	K0
       0x882C1709,  //  001C  GETMBR	R11	R11	K9
       0x1C2C060B,  //  001D  EQ	R11	R3	R11
-      0x782E0095,  //  001E  JMPF	R11	#00B5
+      0x782E008A,  //  001E  JMPF	R11	#00AA
       0xB82E0000,  //  001F  GETNGBL	R11	K0
       0x8C2C170A,  //  0020  GETMET	R11	R11	K10
       0x8834050B,  //  0021  GETMBR	R13	R2	K11
       0x7C2C0400,  //  0022  CALL	R11	2
       0x8C30010C,  //  0023  GETMET	R12	R0	K12
-      0x8838010A,  //  0024  GETMBR	R14	R0	K10
+      0x8838010D,  //  0024  GETMBR	R14	R0	K13
       0x7C300400,  //  0025  CALL	R12	2
-      0x8830010A,  //  0026  GETMBR	R12	R0	K10
-      0x8830190D,  //  0027  GETMBR	R12	R12	K13
-      0x8834010A,  //  0028  GETMBR	R13	R0	K10
-      0x88341B0E,  //  0029  GETMBR	R13	R13	K14
+      0x8830010D,  //  0026  GETMBR	R12	R0	K13
+      0x8830190E,  //  0027  GETMBR	R12	R12	K14
+      0x8834010D,  //  0028  GETMBR	R13	R0	K13
+      0x88341B0F,  //  0029  GETMBR	R13	R13	K15
       0xB83A0000,  //  002A  GETNGBL	R14	K0
-      0x8C381D0F,  //  002B  GETMET	R14	R14	K15
-      0x88400110,  //  002C  GETMBR	R16	R0	K16
+      0x8C381D10,  //  002B  GETMET	R14	R14	K16
+      0x88400111,  //  002C  GETMBR	R16	R0	K17
       0x7C380400,  //  002D  CALL	R14	2
-      0x8C380111,  //  002E  GETMET	R14	R0	K17
+      0x8C380112,  //  002E  GETMET	R14	R0	K18
       0xB8420000,  //  002F  GETNGBL	R16	K0
-      0x88402112,  //  0030  GETMBR	R16	R16	K18
-      0x88440110,  //  0031  GETMBR	R17	R0	K16
+      0x88402113,  //  0030  GETMBR	R16	R16	K19
+      0x88440111,  //  0031  GETMBR	R17	R0	K17
       0x7C380600,  //  0032  CALL	R14	3
-      0x88380110,  //  0033  GETMBR	R14	R0	K16
-      0x903A2714,  //  0034  SETMBR	R14	K19	K20
-      0x88380110,  //  0035  GETMBR	R14	R0	K16
-      0x903A2B14,  //  0036  SETMBR	R14	K21	K20
-      0x88380110,  //  0037  GETMBR	R14	R0	K16
-      0x083C1308,  //  0038  MUL	R15	R9	K8
-      0x003C1F14,  //  0039  ADD	R15	R15	K20
-      0x54420003,  //  003A  LDINT	R16	4
-      0x0C3C1E10,  //  003B  DIV	R15	R15	R16
-      0x903A2C0F,  //  003C  SETMBR	R14	K22	R15
-      0x8C380117,  //  003D  GETMET	R14	R0	K23
-      0xB8420000,  //  003E  GETNGBL	R16	K0
-      0x88402112,  //  003F  GETMBR	R16	R16	K18
-      0xB8460000,  //  0040  GETNGBL	R17	K0
-      0x88442318,  //  0041  GETMBR	R17	R17	K24
-      0x30402011,  //  0042  OR	R16	R16	R17
-      0x7C380400,  //  0043  CALL	R14	2
-      0x8C3C0119,  //  0044  GETMET	R15	R0	K25
-      0xB8460000,  //  0045  GETNGBL	R17	K0
-      0x88442312,  //  0046  GETMBR	R17	R17	K18
-      0xB84A0000,  //  0047  GETNGBL	R18	K0
-      0x88482518,  //  0048  GETMBR	R18	R18	K24
-      0x30442212,  //  0049  OR	R17	R17	R18
-      0x7C3C0400,  //  004A  CALL	R15	2
-      0x04400C09,  //  004B  SUB	R16	R6	R9
-      0x0C440F07,  //  004C  DIV	R17	R7	K7
-      0x0444220A,  //  004D  SUB	R17	R17	R10
-      0x60480009,  //  004E  GETGBL	R18	G9
-      0x544E0059,  //  004F  LDINT	R19	90
-      0x8C50091A,  //  0050  GETMET	R20	R4	K26
-      0x8C58091B,  //  0051  GETMET	R22	R4	K27
-      0x6060000A,  //  0052  GETGBL	R24	G10
-      0x5C642200,  //  0053  MOVE	R25	R17
-      0x7C600200,  //  0054  CALL	R24	1
-      0x6064000A,  //  0055  GETGBL	R25	G10
-      0x5C682000,  //  0056  MOVE	R26	R16
-      0x7C640200,  //  0057  CALL	R25	1
-      0x0C603019,  //  0058  DIV	R24	R24	R25
-      0x7C580400,  //  0059  CALL	R22	2
-      0x7C500400,  //  005A  CALL	R20	2
-      0x044C2614,  //  005B  SUB	R19	R19	R20
-      0x7C480200,  //  005C  CALL	R18	1
-      0x544E002C,  //  005D  LDINT	R19	45
-      0x244C2413,  //  005E  GT	R19	R18	R19
-      0x784E0000,  //  005F  JMPF	R19	#0061
-      0x544A002C,  //  0060  LDINT	R18	45
-      0x884C011C,  //  0061  GETMBR	R19	R0	K28
-      0x0C500F07,  //  0062  DIV	R20	R7	K7
-      0x00501814,  //  0063  ADD	R20	R12	R20
-      0x904E3A14,  //  0064  SETMBR	R19	K29	R20
-      0x884C011C,  //  0065  GETMBR	R19	R0	K28
-      0x00501A06,  //  0066  ADD	R20	R13	R6
-      0x04502914,  //  0067  SUB	R20	R20	K20
-      0x0450280A,  //  0068  SUB	R20	R20	R10
-      0x904E3C14,  //  0069  SETMBR	R19	K30	R20
-      0x884C0110,  //  006A  GETMBR	R19	R0	K16
-      0x88500120,  //  006B  GETMBR	R20	R0	K32
-      0x54560018,  //  006C  LDINT	R21	25
-      0x28502815,  //  006D  GE	R20	R20	R21
-      0x78520001,  //  006E  JMPF	R20	#0071
-      0x5C501C00,  //  006F  MOVE	R20	R14
-      0x70020000,  //  0070  JMP		#0072
-      0x5C501E00,  //  0071  MOVE	R20	R15
-      0x904E3E14,  //  0072  SETMBR	R19	K31	R20
-      0xB84E0000,  //  0073  GETNGBL	R19	K0
-      0x8C4C2721,  //  0074  GETMET	R19	R19	K33
-      0x8854011C,  //  0075  GETMBR	R21	R0	K28
-      0x88542B1D,  //  0076  GETMBR	R21	R21	K29
-      0x8858011C,  //  0077  GETMBR	R22	R0	K28
-      0x88582D1E,  //  0078  GETMBR	R22	R22	K30
-      0x005C1208,  //  0079  ADD	R23	R9	R8
-      0x085E4417,  //  007A  MUL	R23	K34	R23
-      0x005C2E0A,  //  007B  ADD	R23	R23	R10
-      0x58600022,  //  007C  LDCONST	R24	K34
-      0x54660167,  //  007D  LDINT	R25	360
-      0x5C681600,  //  007E  MOVE	R26	R11
-      0x886C0110,  //  007F  GETMBR	R27	R0	K16
-      0x7C4C1000,  //  0080  CALL	R19	8
-      0x884C0110,  //  0081  GETMBR	R19	R0	K16
-      0x88500120,  //  0082  GETMBR	R20	R0	K32
-      0x54560031,  //  0083  LDINT	R21	50
-      0x28502815,  //  0084  GE	R20	R20	R21
-      0x78520001,  //  0085  JMPF	R20	#0088
-      0x5C501C00,  //  0086  MOVE	R20	R14
-      0x70020000,  //  0087  JMP		#0089
-      0x5C501E00,  //  0088  MOVE	R20	R15
-      0x904E3E14,  //  0089  SETMBR	R19	K31	R20
-      0xB84E0000,  //  008A  GETNGBL	R19	K0
-      0x8C4C2721,  //  008B  GETMET	R19	R19	K33
-      0x8854011C,  //  008C  GETMBR	R21	R0	K28
-      0x88542B1D,  //  008D  GETMBR	R21	R21	K29
-      0x8858011C,  //  008E  GETMBR	R22	R0	K28
-      0x88582D1E,  //  008F  GETMBR	R22	R22	K30
-      0x005C1208,  //  0090  ADD	R23	R9	R8
-      0x085E2817,  //  0091  MUL	R23	K20	R23
-      0x005C2E0A,  //  0092  ADD	R23	R23	R10
-      0x045C2F14,  //  0093  SUB	R23	R23	K20
-      0x5462010D,  //  0094  LDINT	R24	270
-      0x04603012,  //  0095  SUB	R24	R24	R18
-      0x5466010D,  //  0096  LDINT	R25	270
-      0x00643212,  //  0097  ADD	R25	R25	R18
-      0x5C681600,  //  0098  MOVE	R26	R11
-      0x886C0110,  //  0099  GETMBR	R27	R0	K16
-      0x7C4C1000,  //  009A  CALL	R19	8
-      0x884C0110,  //  009B  GETMBR	R19	R0	K16
-      0x88500120,  //  009C  GETMBR	R20	R0	K32
-      0x5456004A,  //  009D  LDINT	R21	75
-      0x28502815,  //  009E  GE	R20	R20	R21
-      0x78520001,  //  009F  JMPF	R20	#00A2
-      0x5C501C00,  //  00A0  MOVE	R20	R14
-      0x70020000,  //  00A1  JMP		#00A3
-      0x5C501E00,  //  00A2  MOVE	R20	R15
-      0x904E3E14,  //  00A3  SETMBR	R19	K31	R20
-      0xB84E0000,  //  00A4  GETNGBL	R19	K0
-      0x8C4C2721,  //  00A5  GETMET	R19	R19	K33
-      0x8854011C,  //  00A6  GETMBR	R21	R0	K28
-      0x88542B1D,  //  00A7  GETMBR	R21	R21	K29
-      0x8858011C,  //  00A8  GETMBR	R22	R0	K28
-      0x88582D1E,  //  00A9  GETMBR	R22	R22	K30
-      0x005C1208,  //  00AA  ADD	R23	R9	R8
-      0x085E0E17,  //  00AB  MUL	R23	K7	R23
-      0x005C2E0A,  //  00AC  ADD	R23	R23	R10
-      0x045C2F07,  //  00AD  SUB	R23	R23	K7
-      0x5462010D,  //  00AE  LDINT	R24	270
-      0x04603012,  //  00AF  SUB	R24	R24	R18
-      0x5466010D,  //  00B0  LDINT	R25	270
-      0x00643212,  //  00B1  ADD	R25	R25	R18
-      0x5C681600,  //  00B2  MOVE	R26	R11
-      0x886C0110,  //  00B3  GETMBR	R27	R0	K16
-      0x7C4C1000,  //  00B4  CALL	R19	8
-      0x80000000,  //  00B5  RET	0
+      0x88380111,  //  0033  GETMBR	R14	R0	K17
+      0x903A2915,  //  0034  SETMBR	R14	K20	K21
+      0x88380111,  //  0035  GETMBR	R14	R0	K17
+      0x083C1308,  //  0036  MUL	R15	R9	K8
+      0x003C1F15,  //  0037  ADD	R15	R15	K21
+      0x54420003,  //  0038  LDINT	R16	4
+      0x0C3C1E10,  //  0039  DIV	R15	R15	R16
+      0x903A2C0F,  //  003A  SETMBR	R14	K22	R15
+      0x8C380117,  //  003B  GETMET	R14	R0	K23
+      0xB8420000,  //  003C  GETNGBL	R16	K0
+      0x88402113,  //  003D  GETMBR	R16	R16	K19
+      0xB8460000,  //  003E  GETNGBL	R17	K0
+      0x88442318,  //  003F  GETMBR	R17	R17	K24
+      0x30402011,  //  0040  OR	R16	R16	R17
+      0x7C380400,  //  0041  CALL	R14	2
+      0x8C3C0119,  //  0042  GETMET	R15	R0	K25
+      0xB8460000,  //  0043  GETNGBL	R17	K0
+      0x88442313,  //  0044  GETMBR	R17	R17	K19
+      0xB84A0000,  //  0045  GETNGBL	R18	K0
+      0x88482518,  //  0046  GETMBR	R18	R18	K24
+      0x30442212,  //  0047  OR	R17	R17	R18
+      0x7C3C0400,  //  0048  CALL	R15	2
+      0x04400C09,  //  0049  SUB	R16	R6	R9
+      0x0C440F07,  //  004A  DIV	R17	R7	K7
+      0x0444220A,  //  004B  SUB	R17	R17	R10
+      0x60480009,  //  004C  GETGBL	R18	G9
+      0x544E0059,  //  004D  LDINT	R19	90
+      0x8C50091A,  //  004E  GETMET	R20	R4	K26
+      0x8C58091B,  //  004F  GETMET	R22	R4	K27
+      0x6060000A,  //  0050  GETGBL	R24	G10
+      0x5C642200,  //  0051  MOVE	R25	R17
+      0x7C600200,  //  0052  CALL	R24	1
+      0x6064000A,  //  0053  GETGBL	R25	G10
+      0x5C682000,  //  0054  MOVE	R26	R16
+      0x7C640200,  //  0055  CALL	R25	1
+      0x0C603019,  //  0056  DIV	R24	R24	R25
+      0x7C580400,  //  0057  CALL	R22	2
+      0x7C500400,  //  0058  CALL	R20	2
+      0x044C2614,  //  0059  SUB	R19	R19	R20
+      0x7C480200,  //  005A  CALL	R18	1
+      0x544E002C,  //  005B  LDINT	R19	45
+      0x244C2413,  //  005C  GT	R19	R18	R19
+      0x784E0000,  //  005D  JMPF	R19	#005F
+      0x544A002C,  //  005E  LDINT	R18	45
+      0x884C011C,  //  005F  GETMBR	R19	R0	K28
+      0x0C500F07,  //  0060  DIV	R20	R7	K7
+      0x00501814,  //  0061  ADD	R20	R12	R20
+      0x904E3A14,  //  0062  SETMBR	R19	K29	R20
+      0x884C011C,  //  0063  GETMBR	R19	R0	K28
+      0x00501A06,  //  0064  ADD	R20	R13	R6
+      0x04502915,  //  0065  SUB	R20	R20	K21
+      0x0450280A,  //  0066  SUB	R20	R20	R10
+      0x904E3C14,  //  0067  SETMBR	R19	K30	R20
+      0x884C0111,  //  0068  GETMBR	R19	R0	K17
+      0x88500120,  //  0069  GETMBR	R20	R0	K32
+      0x54560018,  //  006A  LDINT	R21	25
+      0x28502815,  //  006B  GE	R20	R20	R21
+      0x78520001,  //  006C  JMPF	R20	#006F
+      0x5C501C00,  //  006D  MOVE	R20	R14
+      0x70020000,  //  006E  JMP		#0070
+      0x5C501E00,  //  006F  MOVE	R20	R15
+      0x904E3E14,  //  0070  SETMBR	R19	K31	R20
+      0xB84E0000,  //  0071  GETNGBL	R19	K0
+      0x8C4C2721,  //  0072  GETMET	R19	R19	K33
+      0x5C541600,  //  0073  MOVE	R21	R11
+      0x88580111,  //  0074  GETMBR	R22	R0	K17
+      0x885C011C,  //  0075  GETMBR	R23	R0	K28
+      0x00601208,  //  0076  ADD	R24	R9	R8
+      0x08624418,  //  0077  MUL	R24	K34	R24
+      0x0060300A,  //  0078  ADD	R24	R24	R10
+      0x58640022,  //  0079  LDCONST	R25	K34
+      0x546A0167,  //  007A  LDINT	R26	360
+      0x7C4C0E00,  //  007B  CALL	R19	7
+      0x884C0111,  //  007C  GETMBR	R19	R0	K17
+      0x88500120,  //  007D  GETMBR	R20	R0	K32
+      0x54560031,  //  007E  LDINT	R21	50
+      0x28502815,  //  007F  GE	R20	R20	R21
+      0x78520001,  //  0080  JMPF	R20	#0083
+      0x5C501C00,  //  0081  MOVE	R20	R14
+      0x70020000,  //  0082  JMP		#0084
+      0x5C501E00,  //  0083  MOVE	R20	R15
+      0x904E3E14,  //  0084  SETMBR	R19	K31	R20
+      0xB84E0000,  //  0085  GETNGBL	R19	K0
+      0x8C4C2721,  //  0086  GETMET	R19	R19	K33
+      0x5C541600,  //  0087  MOVE	R21	R11
+      0x88580111,  //  0088  GETMBR	R22	R0	K17
+      0x885C011C,  //  0089  GETMBR	R23	R0	K28
+      0x00601208,  //  008A  ADD	R24	R9	R8
+      0x08622A18,  //  008B  MUL	R24	K21	R24
+      0x0060300A,  //  008C  ADD	R24	R24	R10
+      0x04603115,  //  008D  SUB	R24	R24	K21
+      0x5466010D,  //  008E  LDINT	R25	270
+      0x04643212,  //  008F  SUB	R25	R25	R18
+      0x546A010D,  //  0090  LDINT	R26	270
+      0x00683412,  //  0091  ADD	R26	R26	R18
+      0x7C4C0E00,  //  0092  CALL	R19	7
+      0x884C0111,  //  0093  GETMBR	R19	R0	K17
+      0x88500120,  //  0094  GETMBR	R20	R0	K32
+      0x5456004A,  //  0095  LDINT	R21	75
+      0x28502815,  //  0096  GE	R20	R20	R21
+      0x78520001,  //  0097  JMPF	R20	#009A
+      0x5C501C00,  //  0098  MOVE	R20	R14
+      0x70020000,  //  0099  JMP		#009B
+      0x5C501E00,  //  009A  MOVE	R20	R15
+      0x904E3E14,  //  009B  SETMBR	R19	K31	R20
+      0xB84E0000,  //  009C  GETNGBL	R19	K0
+      0x8C4C2721,  //  009D  GETMET	R19	R19	K33
+      0x5C541600,  //  009E  MOVE	R21	R11
+      0x88580111,  //  009F  GETMBR	R22	R0	K17
+      0x885C011C,  //  00A0  GETMBR	R23	R0	K28
+      0x00601208,  //  00A1  ADD	R24	R9	R8
+      0x08620E18,  //  00A2  MUL	R24	K7	R24
+      0x0060300A,  //  00A3  ADD	R24	R24	R10
+      0x04603107,  //  00A4  SUB	R24	R24	K7
+      0x5466010D,  //  00A5  LDINT	R25	270
+      0x04643212,  //  00A6  SUB	R25	R25	R18
+      0x546A010D,  //  00A7  LDINT	R26	270
+      0x00683412,  //  00A8  ADD	R26	R26	R18
+      0x7C4C0E00,  //  00A9  CALL	R19	7
+      0x80000000,  //  00AA  RET	0
     })
   )
 );
@@ -382,7 +371,7 @@ be_local_closure(lv_signal_arcs_get_percentage,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
@@ -411,15 +400,15 @@ be_local_class(lv_signal_arcs,
     &be_class_lv_obj,
     be_nested_map(9,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_const_key(percentage, 4), be_const_var(0) },
-        { be_const_key(p1, 3), be_const_var(1) },
+        { be_const_key(percentage, -1), be_const_var(0) },
+        { be_const_key(area, 4), be_const_var(3) },
         { be_const_key(p2, -1), be_const_var(2) },
-        { be_const_key(area, -1), be_const_var(3) },
-        { be_const_key(line_dsc, -1), be_const_var(4) },
-        { be_const_key(set_percentage, -1), be_const_closure(lv_signal_arcs_set_percentage_closure) },
-        { be_const_key(init, -1), be_const_closure(lv_signal_arcs_init_closure) },
+        { be_const_key(get_percentage, -1), be_const_closure(lv_signal_arcs_get_percentage_closure) },
+        { be_const_key(p1, -1), be_const_var(1) },
+        { be_const_key(arc_dsc, -1), be_const_var(4) },
+        { be_const_key(init, 5), be_const_closure(lv_signal_arcs_init_closure) },
         { be_const_key(widget_event, -1), be_const_closure(lv_signal_arcs_widget_event_closure) },
-        { be_const_key(get_percentage, 5), be_const_closure(lv_signal_arcs_get_percentage_closure) },
+        { be_const_key(set_percentage, 3), be_const_closure(lv_signal_arcs_set_percentage_closure) },
     })),
     be_str_literal("lv_signal_arcs")
 );
diff --git a/lib/libesp32/berry_tasmota/src/be_lvgl_signal_bars_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_signal_bars_lib.c
index 18452ae34..1e10abcea 100644
--- a/lib/libesp32/berry_tasmota/src/be_lvgl_signal_bars_lib.c
+++ b/lib/libesp32/berry_tasmota/src/be_lvgl_signal_bars_lib.c
@@ -14,7 +14,7 @@ be_local_closure(lv_signal_bars_set_percentage,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
@@ -59,7 +59,7 @@ be_local_closure(lv_signal_bars_init,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     2,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
@@ -117,7 +117,7 @@ be_local_closure(lv_signal_bars_widget_event,   /* name */
   be_nested_proto(
     23,                          /* nstack */
     3,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     1,                          /* has sup protos */
@@ -147,7 +147,7 @@ be_local_closure(lv_signal_bars_widget_event,   /* name */
       ),
     }),
     1,                          /* has constants */
-    ( &(const bvalue[37]) {     /* constants */
+    ( &(const bvalue[38]) {     /* constants */
     /* K0   */  be_nested_str(lv),
     /* K1   */  be_nested_str(obj_event_base),
     /* K2   */  be_nested_str(RES_OK),
@@ -157,34 +157,35 @@ be_local_closure(lv_signal_bars_widget_event,   /* name */
     /* K6   */  be_const_int(3),
     /* K7   */  be_const_int(2),
     /* K8   */  be_nested_str(EVENT_DRAW_MAIN),
-    /* K9   */  be_nested_str(area),
+    /* K9   */  be_nested_str(draw_ctx),
     /* K10  */  be_nested_str(param),
     /* K11  */  be_nested_str(get_coords),
-    /* K12  */  be_nested_str(x1),
-    /* K13  */  be_nested_str(y1),
-    /* K14  */  be_nested_str(draw_line_dsc_init),
-    /* K15  */  be_nested_str(line_dsc),
-    /* K16  */  be_nested_str(init_draw_line_dsc),
-    /* K17  */  be_nested_str(PART_MAIN),
-    /* K18  */  be_nested_str(round_start),
-    /* K19  */  be_const_int(1),
-    /* K20  */  be_nested_str(round_end),
-    /* K21  */  be_nested_str(width),
-    /* K22  */  be_nested_str(get_style_line_color),
-    /* K23  */  be_nested_str(STATE_DEFAULT),
-    /* K24  */  be_nested_str(get_style_bg_color),
-    /* K25  */  be_nested_str(event_send),
-    /* K26  */  be_nested_str(EVENT_DRAW_PART_BEGIN),
-    /* K27  */  be_const_int(0),
-    /* K28  */  be_nested_str(color),
-    /* K29  */  be_nested_str(percentage),
-    /* K30  */  be_nested_str(p1),
-    /* K31  */  be_nested_str(y),
-    /* K32  */  be_nested_str(x),
-    /* K33  */  be_nested_str(p2),
-    /* K34  */  be_nested_str(draw_line),
-    /* K35  */  be_nested_str(stop_iteration),
-    /* K36  */  be_nested_str(EVENT_DRAW_PART_END),
+    /* K12  */  be_nested_str(area),
+    /* K13  */  be_nested_str(x1),
+    /* K14  */  be_nested_str(y1),
+    /* K15  */  be_nested_str(draw_line_dsc_init),
+    /* K16  */  be_nested_str(line_dsc),
+    /* K17  */  be_nested_str(init_draw_line_dsc),
+    /* K18  */  be_nested_str(PART_MAIN),
+    /* K19  */  be_nested_str(round_start),
+    /* K20  */  be_const_int(1),
+    /* K21  */  be_nested_str(round_end),
+    /* K22  */  be_nested_str(width),
+    /* K23  */  be_nested_str(get_style_line_color),
+    /* K24  */  be_nested_str(STATE_DEFAULT),
+    /* K25  */  be_nested_str(get_style_bg_color),
+    /* K26  */  be_nested_str(event_send),
+    /* K27  */  be_nested_str(EVENT_DRAW_PART_BEGIN),
+    /* K28  */  be_const_int(0),
+    /* K29  */  be_nested_str(color),
+    /* K30  */  be_nested_str(percentage),
+    /* K31  */  be_nested_str(p1),
+    /* K32  */  be_nested_str(y),
+    /* K33  */  be_nested_str(x),
+    /* K34  */  be_nested_str(p2),
+    /* K35  */  be_nested_str(draw_line),
+    /* K36  */  be_nested_str(stop_iteration),
+    /* K37  */  be_nested_str(EVENT_DRAW_PART_END),
     }),
     &be_const_str_widget_event,
     &be_const_str_solidified,
@@ -225,57 +226,57 @@ be_local_closure(lv_signal_bars_widget_event,   /* name */
       0x8830050A,  //  0021  GETMBR	R12	R2	K10
       0x7C280400,  //  0022  CALL	R10	2
       0x8C2C010B,  //  0023  GETMET	R11	R0	K11
-      0x88340109,  //  0024  GETMBR	R13	R0	K9
+      0x8834010C,  //  0024  GETMBR	R13	R0	K12
       0x7C2C0400,  //  0025  CALL	R11	2
-      0x882C0109,  //  0026  GETMBR	R11	R0	K9
-      0x882C170C,  //  0027  GETMBR	R11	R11	K12
-      0x88300109,  //  0028  GETMBR	R12	R0	K9
-      0x8830190D,  //  0029  GETMBR	R12	R12	K13
+      0x882C010C,  //  0026  GETMBR	R11	R0	K12
+      0x882C170D,  //  0027  GETMBR	R11	R11	K13
+      0x8830010C,  //  0028  GETMBR	R12	R0	K12
+      0x8830190E,  //  0029  GETMBR	R12	R12	K14
       0xB8360000,  //  002A  GETNGBL	R13	K0
-      0x8C341B0E,  //  002B  GETMET	R13	R13	K14
-      0x883C010F,  //  002C  GETMBR	R15	R0	K15
+      0x8C341B0F,  //  002B  GETMET	R13	R13	K15
+      0x883C0110,  //  002C  GETMBR	R15	R0	K16
       0x7C340400,  //  002D  CALL	R13	2
-      0x8C340110,  //  002E  GETMET	R13	R0	K16
+      0x8C340111,  //  002E  GETMET	R13	R0	K17
       0xB83E0000,  //  002F  GETNGBL	R15	K0
-      0x883C1F11,  //  0030  GETMBR	R15	R15	K17
-      0x8840010F,  //  0031  GETMBR	R16	R0	K15
+      0x883C1F12,  //  0030  GETMBR	R15	R15	K18
+      0x88400110,  //  0031  GETMBR	R16	R0	K16
       0x7C340600,  //  0032  CALL	R13	3
-      0x8834010F,  //  0033  GETMBR	R13	R0	K15
-      0x90362513,  //  0034  SETMBR	R13	K18	K19
-      0x8834010F,  //  0035  GETMBR	R13	R0	K15
-      0x90362913,  //  0036  SETMBR	R13	K20	K19
-      0x8834010F,  //  0037  GETMBR	R13	R0	K15
-      0x90362A08,  //  0038  SETMBR	R13	K21	R8
-      0x8C340116,  //  0039  GETMET	R13	R0	K22
+      0x88340110,  //  0033  GETMBR	R13	R0	K16
+      0x90362714,  //  0034  SETMBR	R13	K19	K20
+      0x88340110,  //  0035  GETMBR	R13	R0	K16
+      0x90362B14,  //  0036  SETMBR	R13	K21	K20
+      0x88340110,  //  0037  GETMBR	R13	R0	K16
+      0x90362C08,  //  0038  SETMBR	R13	K22	R8
+      0x8C340117,  //  0039  GETMET	R13	R0	K23
       0xB83E0000,  //  003A  GETNGBL	R15	K0
-      0x883C1F11,  //  003B  GETMBR	R15	R15	K17
+      0x883C1F12,  //  003B  GETMBR	R15	R15	K18
       0xB8420000,  //  003C  GETNGBL	R16	K0
-      0x88402117,  //  003D  GETMBR	R16	R16	K23
+      0x88402118,  //  003D  GETMBR	R16	R16	K24
       0x303C1E10,  //  003E  OR	R15	R15	R16
       0x7C340400,  //  003F  CALL	R13	2
-      0x8C380118,  //  0040  GETMET	R14	R0	K24
+      0x8C380119,  //  0040  GETMET	R14	R0	K25
       0xB8420000,  //  0041  GETNGBL	R16	K0
-      0x88402111,  //  0042  GETMBR	R16	R16	K17
+      0x88402112,  //  0042  GETMBR	R16	R16	K18
       0xB8460000,  //  0043  GETNGBL	R17	K0
-      0x88442317,  //  0044  GETMBR	R17	R17	K23
+      0x88442318,  //  0044  GETMBR	R17	R17	K24
       0x30402011,  //  0045  OR	R16	R16	R17
       0x7C380400,  //  0046  CALL	R14	2
       0xB83E0000,  //  0047  GETNGBL	R15	K0
-      0x8C3C1F19,  //  0048  GETMET	R15	R15	K25
+      0x8C3C1F1A,  //  0048  GETMET	R15	R15	K26
       0x5C440000,  //  0049  MOVE	R17	R0
       0xB84A0000,  //  004A  GETNGBL	R18	K0
-      0x8848251A,  //  004B  GETMBR	R18	R18	K26
-      0x884C010F,  //  004C  GETMBR	R19	R0	K15
+      0x8848251B,  //  004B  GETMBR	R18	R18	K27
+      0x884C0110,  //  004C  GETMBR	R19	R0	K16
       0x7C3C0800,  //  004D  CALL	R15	4
       0x603C0010,  //  004E  GETGBL	R15	G16
-      0x40423706,  //  004F  CONNECT	R16	K27	K6
+      0x40423906,  //  004F  CONNECT	R16	K28	K6
       0x7C3C0200,  //  0050  CALL	R15	1
       0xA802002C,  //  0051  EXBLK	0	#007F
       0x5C401E00,  //  0052  MOVE	R16	R15
       0x7C400000,  //  0053  CALL	R16	0
-      0x8844010F,  //  0054  GETMBR	R17	R0	K15
-      0x8848011D,  //  0055  GETMBR	R18	R0	K29
-      0x004C2113,  //  0056  ADD	R19	R16	K19
+      0x88440110,  //  0054  GETMBR	R17	R0	K16
+      0x8848011E,  //  0055  GETMBR	R18	R0	K30
+      0x004C2114,  //  0056  ADD	R19	R16	K20
       0x54520013,  //  0057  LDINT	R20	20
       0x084C2614,  //  0058  MUL	R19	R19	R20
       0x28482413,  //  0059  GE	R18	R18	R19
@@ -283,19 +284,19 @@ be_local_closure(lv_signal_bars_widget_event,   /* name */
       0x5C481A00,  //  005B  MOVE	R18	R13
       0x70020000,  //  005C  JMP		#005E
       0x5C481C00,  //  005D  MOVE	R18	R14
-      0x90463812,  //  005E  SETMBR	R17	K28	R18
-      0x8844011E,  //  005F  GETMBR	R17	R0	K30
+      0x90463A12,  //  005E  SETMBR	R17	K29	R18
+      0x8844011F,  //  005F  GETMBR	R17	R0	K31
       0x00481805,  //  0060  ADD	R18	R12	R5
-      0x04482513,  //  0061  SUB	R18	R18	K19
+      0x04482514,  //  0061  SUB	R18	R18	K20
       0x04482409,  //  0062  SUB	R18	R18	R9
-      0x90463E12,  //  0063  SETMBR	R17	K31	R18
-      0x8844011E,  //  0064  GETMBR	R17	R0	K30
+      0x90464012,  //  0063  SETMBR	R17	K32	R18
+      0x8844011F,  //  0064  GETMBR	R17	R0	K31
       0x00481007,  //  0065  ADD	R18	R8	R7
       0x08482012,  //  0066  MUL	R18	R16	R18
       0x00481612,  //  0067  ADD	R18	R11	R18
       0x00482409,  //  0068  ADD	R18	R18	R9
-      0x90464012,  //  0069  SETMBR	R17	K32	R18
-      0x88440121,  //  006A  GETMBR	R17	R0	K33
+      0x90464212,  //  0069  SETMBR	R17	K33	R18
+      0x88440122,  //  006A  GETMBR	R17	R0	K34
       0x044A0C10,  //  006B  SUB	R18	K6	R16
       0x044C0A08,  //  006C  SUB	R19	R5	R8
       0x08482413,  //  006D  MUL	R18	R18	R19
@@ -303,28 +304,28 @@ be_local_closure(lv_signal_bars_widget_event,   /* name */
       0x0C482413,  //  006F  DIV	R18	R18	R19
       0x00481812,  //  0070  ADD	R18	R12	R18
       0x00482409,  //  0071  ADD	R18	R18	R9
-      0x90463E12,  //  0072  SETMBR	R17	K31	R18
-      0x88440121,  //  0073  GETMBR	R17	R0	K33
-      0x8848011E,  //  0074  GETMBR	R18	R0	K30
-      0x88482520,  //  0075  GETMBR	R18	R18	K32
-      0x90464012,  //  0076  SETMBR	R17	K32	R18
+      0x90464012,  //  0072  SETMBR	R17	K32	R18
+      0x88440122,  //  0073  GETMBR	R17	R0	K34
+      0x8848011F,  //  0074  GETMBR	R18	R0	K31
+      0x88482521,  //  0075  GETMBR	R18	R18	K33
+      0x90464212,  //  0076  SETMBR	R17	K33	R18
       0xB8460000,  //  0077  GETNGBL	R17	K0
-      0x8C442322,  //  0078  GETMET	R17	R17	K34
-      0x884C011E,  //  0079  GETMBR	R19	R0	K30
-      0x88500121,  //  007A  GETMBR	R20	R0	K33
-      0x5C541400,  //  007B  MOVE	R21	R10
-      0x8858010F,  //  007C  GETMBR	R22	R0	K15
+      0x8C442323,  //  0078  GETMET	R17	R17	K35
+      0x5C4C1400,  //  0079  MOVE	R19	R10
+      0x88500110,  //  007A  GETMBR	R20	R0	K16
+      0x8854011F,  //  007B  GETMBR	R21	R0	K31
+      0x88580122,  //  007C  GETMBR	R22	R0	K34
       0x7C440A00,  //  007D  CALL	R17	5
       0x7001FFD2,  //  007E  JMP		#0052
-      0x583C0023,  //  007F  LDCONST	R15	K35
+      0x583C0024,  //  007F  LDCONST	R15	K36
       0xAC3C0200,  //  0080  CATCH	R15	1	0
       0xB0080000,  //  0081  RAISE	2	R0	R0
       0xB83E0000,  //  0082  GETNGBL	R15	K0
-      0x8C3C1F19,  //  0083  GETMET	R15	R15	K25
+      0x8C3C1F1A,  //  0083  GETMET	R15	R15	K26
       0x5C440000,  //  0084  MOVE	R17	R0
       0xB84A0000,  //  0085  GETNGBL	R18	K0
-      0x88482524,  //  0086  GETMBR	R18	R18	K36
-      0x884C010F,  //  0087  GETMBR	R19	R0	K15
+      0x88482525,  //  0086  GETMBR	R18	R18	K37
+      0x884C0110,  //  0087  GETMBR	R19	R0	K16
       0x7C3C0800,  //  0088  CALL	R15	4
       0x80000000,  //  0089  RET	0
     })
@@ -340,7 +341,7 @@ be_local_closure(lv_signal_bars_get_percentage,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
-    0,                          /* varg */
+    2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
@@ -370,14 +371,14 @@ be_local_class(lv_signal_bars,
     be_nested_map(9,
     ( (struct bmapnode*) &(const bmapnode[]) {
         { be_const_key(percentage, 4), be_const_var(0) },
-        { be_const_key(p1, 3), be_const_var(1) },
+        { be_const_key(p1, 5), be_const_var(1) },
         { be_const_key(p2, -1), be_const_var(2) },
-        { be_const_key(area, -1), be_const_var(3) },
+        { be_const_key(get_percentage, -1), be_const_closure(lv_signal_bars_get_percentage_closure) },
         { be_const_key(line_dsc, -1), be_const_var(4) },
-        { be_const_key(set_percentage, -1), be_const_closure(lv_signal_bars_set_percentage_closure) },
+        { be_const_key(area, -1), be_const_var(3) },
         { be_const_key(init, -1), be_const_closure(lv_signal_bars_init_closure) },
         { be_const_key(widget_event, -1), be_const_closure(lv_signal_bars_widget_event_closure) },
-        { be_const_key(get_percentage, 5), be_const_closure(lv_signal_bars_get_percentage_closure) },
+        { be_const_key(set_percentage, 3), be_const_closure(lv_signal_bars_set_percentage_closure) },
     })),
     be_str_literal("lv_signal_bars")
 );
diff --git a/lib/libesp32/berry_tasmota/src/be_tasmota_log_reader_class.cpp b/lib/libesp32/berry_tasmota/src/be_tasmota_log_reader_class.cpp
new file mode 100644
index 000000000..0ab880c9f
--- /dev/null
+++ b/lib/libesp32/berry_tasmota/src/be_tasmota_log_reader_class.cpp
@@ -0,0 +1,25 @@
+/********************************************************************
+ * Tasmota Log Reader class
+ * 
+ *******************************************************************/
+#include "be_constobj.h"
+#include "be_mapping.h"
+
+extern uint32_t* tlr_init(void);                            BE_FUNC_CTYPE_DECLARE(tlr_init, "+_p", "")
+extern char* tlr_get_log(uint32_t* idx, int32_t log_level); BE_FUNC_CTYPE_DECLARE(tlr_get_log, "s", ".i")
+
+#include "be_fixed_be_class_tasmota_log_reader.h"
+
+extern "C" void be_load_tasmota_log_reader_class(bvm *vm) {
+    be_pushntvclass(vm, &be_class_tasmota_log_reader);
+    be_setglobal(vm, "tasmota_log_reader");
+    be_pop(vm, 1);
+}
+/* @const_object_info_begin
+
+class be_class_tasmota_log_reader (scope: global, name: tasmota_log_reader) {
+    _p, var
+    init, ctype_func(tlr_init)
+    get_log, ctype_func(tlr_get_log)
+}
+@const_object_info_end */
diff --git a/lib/libesp32/berry_tasmota/src/embedded/lv_signal_arcs.be b/lib/libesp32/berry_tasmota/src/embedded/lv_signal_arcs.be
index 614c5ec65..fccbb7625 100644
--- a/lib/libesp32/berry_tasmota/src/embedded/lv_signal_arcs.be
+++ b/lib/libesp32/berry_tasmota/src/embedded/lv_signal_arcs.be
@@ -4,7 +4,7 @@
 
 class lv_signal_arcs : lv.obj
   var percentage          # value to display, range 0..100
-  var p1, p2, area, line_dsc    # instances of objects kept to avoid re-instanciating at each call
+  var p1, p2, area, arc_dsc    # instances of objects kept to avoid re-instanciating at each call
 
   def init(parent)
     # init custom widget (don't call super constructor)
@@ -15,7 +15,7 @@ class lv_signal_arcs : lv.obj
     self.p1 = lv.point()
     self.p2 = lv.point()
     self.area = lv.area()
-    self.line_dsc = lv.draw_line_dsc()
+    self.arc_dsc = lv.draw_arc_dsc()
   end
 
   def widget_event(cl, event)
@@ -35,19 +35,18 @@ class lv_signal_arcs : lv.obj
     #print("inter_bar", inter_bar, "bar", bar, "bar_offset", bar_offset)
 
     if code == lv.EVENT_DRAW_MAIN
-      var clip_area = lv.area(event.param)
+      var draw_ctx = lv.draw_ctx(event.param)
     
       # get coordinates of object
       self.get_coords(self.area)
       var x_ofs = self.area.x1
       var y_ofs = self.area.y1
 
-      lv.draw_line_dsc_init(self.line_dsc)                  # initialize lv.draw_line_dsc structure
-      self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc)  # copy the current values
+      lv.draw_arc_dsc_init(self.arc_dsc)                  # initialize lv.draw_line_dsc structure
+      self.init_draw_arc_dsc(lv.PART_MAIN, self.arc_dsc)  # copy the current values
 
-      self.line_dsc.round_start = 1
-      self.line_dsc.round_end = 1
-      self.line_dsc.width = (bar * 3 + 1) / 4
+      self.arc_dsc.rounded = 1
+      self.arc_dsc.width = (bar * 3 + 1) / 4
       var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT)
       var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT)
 
@@ -64,12 +63,12 @@ class lv_signal_arcs : lv.obj
       self.p1.x = x_ofs + width / 2
       self.p1.y = y_ofs + height - 1 - bar_offset
 
-      self.line_dsc.color = self.percentage >= 25 ? on_color : off_color
-      lv.draw_arc(self.p1.x, self.p1.y, 0 * (bar + inter_bar) + bar_offset, 0, 360, clip_area, self.line_dsc)
-      self.line_dsc.color = self.percentage >= 50 ? on_color : off_color
-      lv.draw_arc(self.p1.x, self.p1.y, 1 * (bar + inter_bar) + bar_offset - 1, 270 - angle, 270 + angle, clip_area, self.line_dsc)
-      self.line_dsc.color = self.percentage >= 75 ? on_color : off_color
-      lv.draw_arc(self.p1.x, self.p1.y, 2 * (bar + inter_bar) + bar_offset - 2, 270 - angle, 270 + angle, clip_area, self.line_dsc)
+      self.arc_dsc.color = self.percentage >= 25 ? on_color : off_color
+      lv.draw_arc(draw_ctx, self.arc_dsc, self.p1, 0 * (bar + inter_bar) + bar_offset, 0, 360)
+      self.arc_dsc.color = self.percentage >= 50 ? on_color : off_color
+      lv.draw_arc(draw_ctx, self.arc_dsc, self.p1, 1 * (bar + inter_bar) + bar_offset - 1, 270 - angle, 270 + angle)
+      self.arc_dsc.color = self.percentage >= 75 ? on_color : off_color
+      lv.draw_arc(draw_ctx, self.arc_dsc, self.p1, 2 * (bar + inter_bar) + bar_offset - 2, 270 - angle, 270 + angle)
 
     #elif mode == lv.DESIGN_DRAW_POST    # commented since we don't want a frame around this object
       # self.ancestor_design.call(self, clip_area, mode)
@@ -129,4 +128,4 @@ class lv_wifi_arcs_icon: lv_wifi_arcs
       parent.set_style_pad_right(pad_right + w + 1, lv.PART_MAIN | lv.STATE_DEFAULT)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/libesp32/berry_tasmota/src/embedded/lv_signal_bars.be b/lib/libesp32/berry_tasmota/src/embedded/lv_signal_bars.be
index 7e0c24a89..e02ea48ce 100644
--- a/lib/libesp32/berry_tasmota/src/embedded/lv_signal_bars.be
+++ b/lib/libesp32/berry_tasmota/src/embedded/lv_signal_bars.be
@@ -33,7 +33,7 @@ class lv_signal_bars : lv.obj
     var bar_offset = bar / 2
 
     if code == lv.EVENT_DRAW_MAIN
-      var clip_area = lv.area(event.param)
+      var draw_ctx = lv.draw_ctx(event.param)
 
       # get coordinates of object
       self.get_coords(self.area)
@@ -56,7 +56,7 @@ class lv_signal_bars : lv.obj
         self.p1.x = x_ofs + i * (bar + inter_bar) + bar_offset
         self.p2.y = y_ofs + ((3 - i) * (height - bar)) / 4 + bar_offset
         self.p2.x = self.p1.x
-        lv.draw_line(self.p1, self.p2, clip_area, self.line_dsc)
+        lv.draw_line(draw_ctx, self.line_dsc, self.p1, self.p2)
       end
       lv.event_send(self, lv.EVENT_DRAW_PART_END, self.line_dsc)
     end
diff --git a/lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be b/lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be
index 5be5733d3..3e42bdb8b 100644
--- a/lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be
+++ b/lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be
@@ -13,6 +13,7 @@ def init(lv_tasmota)
 
   lv.font_seg7 = lv_tasmota.font_seg7
   lv.seg7_font = lv_tasmota.font_seg7
+  lv.font_embedded = lv_tasmota.font_embedded
 
   lv.load_freetype_font = lv_tasmota.load_freetype_font
 
diff --git a/lib/libesp32_lvgl/LVGL_assets/src/lv_theme_openhasp.c b/lib/libesp32_lvgl/LVGL_assets/src/lv_theme_openhasp.c
index 8e11c0ec5..d0f78a955 100644
--- a/lib/libesp32_lvgl/LVGL_assets/src/lv_theme_openhasp.c
+++ b/lib/libesp32_lvgl/LVGL_assets/src/lv_theme_openhasp.c
@@ -27,7 +27,7 @@
 #define DARK_COLOR_TEXT        lv_color_hex(0xefefef)
 #define DARK_COLOR_GREY        lv_color_hex(0x2f3237)
 
-#define TRANSITION_TIME         LV_THEME_DEFAULT_TRANSITON_TIME
+#define TRANSITION_TIME         LV_THEME_DEFAULT_TRANSITION_TIME
 #define BORDER_WIDTH            lv_disp_dpx(theme.disp, 2)
 #define OUTLINE_WIDTH           lv_disp_dpx(theme.disp, 3)
 
diff --git a/lib/libesp32_lvgl/freetype/library.json b/lib/libesp32_lvgl/freetype/library.json
index f8864de49..dd7932a53 100644
--- a/lib/libesp32_lvgl/freetype/library.json
+++ b/lib/libesp32_lvgl/freetype/library.json
@@ -15,6 +15,7 @@
         "+<base/ftsystem.c>",
         "+<base/ftinit.c>",
         "+<base/ftdebug.c>",
+        "+<base/ftbitmap.c>",
 
         "+<base/ftbase.c>",
 
diff --git a/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h b/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h
index 30fe69786..a6a0be0a7 100644
--- a/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h
+++ b/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h
@@ -29,6 +29,8 @@ const be_ntv_func_def_t lv_style_func[] = {
   { "set_base_dir", { (const void*) &lv_style_set_base_dir, "", "(lv.lv_style)i" } },
   { "set_bg_color", { (const void*) &lv_style_set_bg_color, "", "(lv.lv_style)(lv.lv_color)" } },
   { "set_bg_color_filtered", { (const void*) &lv_style_set_bg_color_filtered, "", "(lv.lv_style)(lv.lv_color)" } },
+  { "set_bg_dither_mode", { (const void*) &lv_style_set_bg_dither_mode, "", "(lv.lv_style)i" } },
+  { "set_bg_grad", { (const void*) &lv_style_set_bg_grad, "", "(lv.lv_style)(lv.lv_grad_dsc)" } },
   { "set_bg_grad_color", { (const void*) &lv_style_set_bg_grad_color, "", "(lv.lv_style)(lv.lv_color)" } },
   { "set_bg_grad_color_filtered", { (const void*) &lv_style_set_bg_grad_color_filtered, "", "(lv.lv_style)(lv.lv_color)" } },
   { "set_bg_grad_dir", { (const void*) &lv_style_set_bg_grad_dir, "", "(lv.lv_style)i" } },
@@ -216,6 +218,7 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "get_content_width", { (const void*) &lv_obj_get_content_width, "i", "(lv.lv_obj)" } },
   { "get_coords", { (const void*) &lv_obj_get_coords, "", "(lv.lv_obj)(lv.lv_area)" } },
   { "get_disp", { (const void*) &lv_obj_get_disp, "lv.lv_disp", "(lv.lv_obj)" } },
+  { "get_event_user_data", { (const void*) &lv_obj_get_event_user_data, ".", "(lv.lv_obj)^lv_event_cb^" } },
   { "get_group", { (const void*) &lv_obj_get_group, ".", "(lv.lv_obj)" } },
   { "get_height", { (const void*) &lv_obj_get_height, "i", "(lv.lv_obj)" } },
   { "get_index", { (const void*) &lv_obj_get_index, "i", "(lv.lv_obj)" } },
@@ -249,6 +252,8 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "get_style_base_dir", { (const void*) &lv_obj_get_style_base_dir, "i", "(lv.lv_obj)i" } },
   { "get_style_bg_color", { (const void*) &lv_obj_get_style_bg_color, "lv.lv_color", "(lv.lv_obj)i" } },
   { "get_style_bg_color_filtered", { (const void*) &lv_obj_get_style_bg_color_filtered, "lv.lv_color", "(lv.lv_obj)i" } },
+  { "get_style_bg_dither_mode", { (const void*) &lv_obj_get_style_bg_dither_mode, "i", "(lv.lv_obj)i" } },
+  { "get_style_bg_grad", { (const void*) &lv_obj_get_style_bg_grad, "lv.lv_grad_dsc", "(lv.lv_obj)i" } },
   { "get_style_bg_grad_color", { (const void*) &lv_obj_get_style_bg_grad_color, "lv.lv_color", "(lv.lv_obj)i" } },
   { "get_style_bg_grad_color_filtered", { (const void*) &lv_obj_get_style_bg_grad_color_filtered, "lv.lv_color", "(lv.lv_obj)i" } },
   { "get_style_bg_grad_dir", { (const void*) &lv_obj_get_style_bg_grad_dir, "i", "(lv.lv_obj)i" } },
@@ -387,6 +392,7 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "remove_style", { (const void*) &lv_obj_remove_style, "", "(lv.lv_obj)(lv.lv_style)i" } },
   { "remove_style_all", { (const void*) &lv_obj_remove_style_all, "", "(lv.lv_obj)" } },
   { "scroll_by", { (const void*) &lv_obj_scroll_by, "", "(lv.lv_obj)ii(lv.lv_anim_enable)" } },
+  { "scroll_by_bounded", { (const void*) &lv_obj_scroll_by_bounded, "", "(lv.lv_obj)ii(lv.lv_anim_enable)" } },
   { "scroll_to", { (const void*) &lv_obj_scroll_to, "", "(lv.lv_obj)ii(lv.lv_anim_enable)" } },
   { "scroll_to_view", { (const void*) &lv_obj_scroll_to_view, "", "(lv.lv_obj)(lv.lv_anim_enable)" } },
   { "scroll_to_view_recursive", { (const void*) &lv_obj_scroll_to_view_recursive, "", "(lv.lv_obj)(lv.lv_anim_enable)" } },
@@ -425,6 +431,8 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "set_style_base_dir", { (const void*) &lv_obj_set_style_base_dir, "", "(lv.lv_obj)ii" } },
   { "set_style_bg_color", { (const void*) &lv_obj_set_style_bg_color, "", "(lv.lv_obj)(lv.lv_color)i" } },
   { "set_style_bg_color_filtered", { (const void*) &lv_obj_set_style_bg_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" } },
+  { "set_style_bg_dither_mode", { (const void*) &lv_obj_set_style_bg_dither_mode, "", "(lv.lv_obj)ii" } },
+  { "set_style_bg_grad", { (const void*) &lv_obj_set_style_bg_grad, "", "(lv.lv_obj)(lv.lv_grad_dsc)i" } },
   { "set_style_bg_grad_color", { (const void*) &lv_obj_set_style_bg_grad_color, "", "(lv.lv_obj)(lv.lv_color)i" } },
   { "set_style_bg_grad_color_filtered", { (const void*) &lv_obj_set_style_bg_grad_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" } },
   { "set_style_bg_grad_dir", { (const void*) &lv_obj_set_style_bg_grad_dir, "", "(lv.lv_obj)ii" } },
@@ -822,6 +830,7 @@ const be_ntv_func_def_t lv_dropdown_func[] = {
   { "get_selected_str", { (const void*) &lv_dropdown_get_selected_str, "", "(lv.lv_obj)si" } },
   { "get_symbol", { (const void*) &lv_dropdown_get_symbol, "s", "(lv.lv_obj)" } },
   { "get_text", { (const void*) &lv_dropdown_get_text, "s", "(lv.lv_obj)" } },
+  { "is_open", { (const void*) &lv_dropdown_is_open, "b", "(lv.lv_obj)" } },
   { "open", { (const void*) &lv_dropdown_open, "", "(lv.lv_obj)" } },
   { "set_dir", { (const void*) &lv_dropdown_set_dir, "", "(lv.lv_obj)i" } },
   { "set_options", { (const void*) &lv_dropdown_set_options, "", "(lv.lv_obj)s" } },
diff --git a/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c
index 10d3d9ebc..e881da22a 100644
--- a/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c
+++ b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c
@@ -53,15 +53,17 @@ const be_ntv_func_def_t lv_func[] = {
   { "color_to_hsv", { (const void*) &lv_color_to_hsv, "i", "(lv.lv_color)" } },
   { "color_white", { (const void*) &lv_color_white, "lv.lv_color", "" } },
   { "dpx", { (const void*) &lv_dpx, "i", "i" } },
-  { "draw_arc", { (const void*) &lv_draw_arc, "", "iiiii(lv.lv_area)(lv.lv_draw_arc_dsc)" } },
+  { "draw_arc", { (const void*) &lv_draw_arc, "", "(lv.lv_draw_ctx)(lv.lv_draw_arc_dsc)(lv.lv_point)iii" } },
   { "draw_arc_dsc_init", { (const void*) &lv_draw_arc_dsc_init, "", "(lv.lv_draw_arc_dsc)" } },
   { "draw_arc_get_area", { (const void*) &lv_draw_arc_get_area, "", "iiiiiib(lv.lv_area)" } },
-  { "draw_img", { (const void*) &lv_draw_img, "", "(lv.lv_area)(lv.lv_area).(lv.lv_draw_img_dsc)" } },
+  { "draw_img", { (const void*) &lv_draw_img, "", "(lv.lv_draw_ctx)(lv.lv_draw_img_dsc)(lv.lv_area)." } },
+  { "draw_img_decoded", { (const void*) &lv_draw_img_decoded, "", "(lv.lv_draw_ctx)(lv.lv_draw_img_dsc)(lv.lv_area)(lv.uint8)i" } },
   { "draw_img_dsc_init", { (const void*) &lv_draw_img_dsc_init, "", "(lv.lv_draw_img_dsc)" } },
-  { "draw_label", { (const void*) &lv_draw_label, "", "(lv.lv_area)(lv.lv_area)(lv.lv_draw_label_dsc)s(lv.lv_draw_label_hint)" } },
+  { "draw_init", { (const void*) &lv_draw_init, "", "" } },
+  { "draw_label", { (const void*) &lv_draw_label, "", "(lv.lv_draw_ctx)(lv.lv_draw_label_dsc)(lv.lv_area)s(lv.lv_draw_label_hint)" } },
   { "draw_label_dsc_init", { (const void*) &lv_draw_label_dsc_init, "", "(lv.lv_draw_label_dsc)" } },
-  { "draw_letter", { (const void*) &lv_draw_letter, "", "(lv.lv_point)(lv.lv_area)(lv.lv_font)i(lv.lv_color)ii" } },
-  { "draw_line", { (const void*) &lv_draw_line, "", "(lv.lv_point)(lv.lv_point)(lv.lv_area)(lv.lv_draw_line_dsc)" } },
+  { "draw_letter", { (const void*) &lv_draw_letter, "", "(lv.lv_draw_ctx)(lv.lv_draw_label_dsc)(lv.lv_point)i" } },
+  { "draw_line", { (const void*) &lv_draw_line, "", "(lv.lv_draw_ctx)(lv.lv_draw_line_dsc)(lv.lv_point)(lv.lv_point)" } },
   { "draw_line_dsc_init", { (const void*) &lv_draw_line_dsc_init, "", "(lv.lv_draw_line_dsc)" } },
   { "draw_mask_add", { (const void*) &lv_draw_mask_add, "i", ".." } },
   { "draw_mask_angle_init", { (const void*) &lv_draw_mask_angle_init, "", "(lv.lv_draw_mask_angle_param)iiii" } },
@@ -74,17 +76,20 @@ const be_ntv_func_def_t lv_func[] = {
   { "draw_mask_line_angle_init", { (const void*) &lv_draw_mask_line_angle_init, "", "(lv.lv_draw_mask_line_param)iiii" } },
   { "draw_mask_line_points_init", { (const void*) &lv_draw_mask_line_points_init, "", "(lv.lv_draw_mask_line_param)iiiii" } },
   { "draw_mask_map_init", { (const void*) &lv_draw_mask_map_init, "", "(lv.lv_draw_mask_map_param)(lv.lv_area)(lv.lv_opa)" } },
+  { "draw_mask_polygon_init", { (const void*) &lv_draw_mask_polygon_init, "", "(lv.lv_draw_mask_polygon_param)(lv.lv_point)i" } },
   { "draw_mask_radius_init", { (const void*) &lv_draw_mask_radius_init, "", "(lv.lv_draw_mask_radius_param)(lv.lv_area)ib" } },
   { "draw_mask_remove_custom", { (const void*) &lv_draw_mask_remove_custom, ".", "." } },
   { "draw_mask_remove_id", { (const void*) &lv_draw_mask_remove_id, ".", "i" } },
-  { "draw_polygon", { (const void*) &lv_draw_polygon, "", "(lv.lv_point_arr)i(lv.lv_area)(lv.lv_draw_rect_dsc)" } },
-  { "draw_rect", { (const void*) &lv_draw_rect, "", "(lv.lv_area)(lv.lv_area)(lv.lv_draw_rect_dsc)" } },
+  { "draw_polygon", { (const void*) &lv_draw_polygon, "", "(lv.lv_draw_ctx)(lv.lv_draw_rect_dsc)(lv.lv_point_arr)i" } },
+  { "draw_rect", { (const void*) &lv_draw_rect, "", "(lv.lv_draw_ctx)(lv.lv_draw_rect_dsc)(lv.lv_area)" } },
   { "draw_rect_dsc_init", { (const void*) &lv_draw_rect_dsc_init, "", "(lv.lv_draw_rect_dsc)" } },
-  { "draw_triangle", { (const void*) &lv_draw_triangle, "", "(lv.lv_point_arr)(lv.lv_area)(lv.lv_draw_rect_dsc)" } },
+  { "draw_triangle", { (const void*) &lv_draw_triangle, "", "(lv.lv_draw_ctx)(lv.lv_draw_rect_dsc)(lv.lv_point_arr)" } },
   { "event_register_id", { (const void*) &lv_event_register_id, "i", "" } },
   { "event_send", { (const void*) &lv_event_send, "i", "(lv.lv_obj)i." } },
   { "event_set_cover_res", { (const void*) &lv_event_set_cover_res, "", "(lv.lv_event)(lv.lv_cover_res)" } },
   { "event_set_ext_draw_size", { (const void*) &lv_event_set_ext_draw_size, "", "(lv.lv_event)i" } },
+  { "event_stop_bubbling", { (const void*) &lv_event_stop_bubbling, "", "(lv.lv_event)" } },
+  { "event_stop_processing", { (const void*) &lv_event_stop_processing, "", "(lv.lv_event)" } },
   { "flex_init", { (const void*) &lv_flex_init, "", "" } },
   { "get_hor_res", { (const void*) &lv_get_hor_res, "i", "" } },
   { "get_ts_calibration", { (const void*) &lv_get_ts_calibration, "lv.lv_ts_calibration", "" } },
@@ -103,7 +108,7 @@ const be_ntv_func_def_t lv_func[] = {
   { "layout_register", { (const void*) &lv_layout_register, "i", "^lv_layout_update_cb^." } },
   { "obj_class_create_obj", { (const void*) &lv_obj_class_create_obj, "lv.lv_obj", "(lv._lv_obj_class)(lv.lv_obj)" } },
   { "obj_del_anim_ready_cb", { (const void*) &lv_obj_del_anim_ready_cb, "", "(lv.lv_anim)" } },
-  { "obj_draw_dsc_init", { (const void*) &lv_obj_draw_dsc_init, "", "(lv.lv_obj_draw_part_dsc)(lv.lv_area)" } },
+  { "obj_draw_dsc_init", { (const void*) &lv_obj_draw_dsc_init, "", "(lv.lv_obj_draw_part_dsc)(lv.lv_draw_ctx)" } },
   { "obj_draw_part_check_type", { (const void*) &lv_obj_draw_part_check_type, "b", "(lv.lv_obj_draw_part_dsc)(lv._lv_obj_class)i" } },
   { "obj_enable_style_refresh", { (const void*) &lv_obj_enable_style_refresh, "", "b" } },
   { "obj_event_base", { (const void*) &lv_obj_event_base, "i", "(lv.lv_obj_class)(lv.lv_event)" } },
@@ -113,7 +118,11 @@ const be_ntv_func_def_t lv_func[] = {
   { "palette_darken", { (const void*) &lv_palette_darken, "lv.lv_color", "ii" } },
   { "palette_lighten", { (const void*) &lv_palette_lighten, "lv.lv_color", "ii" } },
   { "palette_main", { (const void*) &lv_palette_main, "lv.lv_color", "i" } },
+  { "qrcode_create", { (const void*) &lv_qrcode_create, "lv.lv_obj", "(lv.lv_obj)i(lv.lv_color)(lv.lv_color)" } },
+  { "qrcode_delete", { (const void*) &lv_qrcode_delete, "", "(lv.lv_obj)" } },
+  { "qrcode_update", { (const void*) &lv_qrcode_update, "i", "(lv.lv_obj).i" } },
   { "refr_now", { (const void*) &lv_refr_now, "", "(lv.lv_disp)" } },
+  { "refr_obj", { (const void*) &lv_refr_obj, "", "(lv.lv_draw_ctx)(lv.lv_obj)" } },
   { "scr_act", { (const void*) &lv_scr_act, "lv.lv_obj", "" } },
   { "scr_load", { (const void*) &lv_scr_load, "", "(lv.lv_obj)" } },
   { "scr_load_anim", { (const void*) &lv_scr_load_anim, "", "(lv.lv_obj)iiib" } },
@@ -188,6 +197,7 @@ const be_const_member_t lv0_constants[] = {
     { "BLEND_MODE_ADDITIVE", be_cconst_int(LV_BLEND_MODE_ADDITIVE) },
     { "BLEND_MODE_MULTIPLY", be_cconst_int(LV_BLEND_MODE_MULTIPLY) },
     { "BLEND_MODE_NORMAL", be_cconst_int(LV_BLEND_MODE_NORMAL) },
+    { "BLEND_MODE_REPLACE", be_cconst_int(LV_BLEND_MODE_REPLACE) },
     { "BLEND_MODE_SUBTRACTIVE", be_cconst_int(LV_BLEND_MODE_SUBTRACTIVE) },
     { "BORDER_SIDE_BOTTOM", be_cconst_int(LV_BORDER_SIDE_BOTTOM) },
     { "BORDER_SIDE_FULL", be_cconst_int(LV_BORDER_SIDE_FULL) },
@@ -260,6 +270,9 @@ const be_const_member_t lv0_constants[] = {
     { "DISP_ROT_270", be_cconst_int(LV_DISP_ROT_270) },
     { "DISP_ROT_90", be_cconst_int(LV_DISP_ROT_90) },
     { "DISP_ROT_NONE", be_cconst_int(LV_DISP_ROT_NONE) },
+    { "DITHER_ERR_DIFF", be_cconst_int(LV_DITHER_ERR_DIFF) },
+    { "DITHER_NONE", be_cconst_int(LV_DITHER_NONE) },
+    { "DITHER_ORDERED", be_cconst_int(LV_DITHER_ORDERED) },
     { "DRAW_MASK_LINE_SIDE_BOTTOM", be_cconst_int(LV_DRAW_MASK_LINE_SIDE_BOTTOM) },
     { "DRAW_MASK_LINE_SIDE_LEFT", be_cconst_int(LV_DRAW_MASK_LINE_SIDE_LEFT) },
     { "DRAW_MASK_LINE_SIDE_RIGHT", be_cconst_int(LV_DRAW_MASK_LINE_SIDE_RIGHT) },
@@ -272,6 +285,7 @@ const be_const_member_t lv0_constants[] = {
     { "DRAW_MASK_TYPE_FADE", be_cconst_int(LV_DRAW_MASK_TYPE_FADE) },
     { "DRAW_MASK_TYPE_LINE", be_cconst_int(LV_DRAW_MASK_TYPE_LINE) },
     { "DRAW_MASK_TYPE_MAP", be_cconst_int(LV_DRAW_MASK_TYPE_MAP) },
+    { "DRAW_MASK_TYPE_POLYGON", be_cconst_int(LV_DRAW_MASK_TYPE_POLYGON) },
     { "DRAW_MASK_TYPE_RADIUS", be_cconst_int(LV_DRAW_MASK_TYPE_RADIUS) },
     { "EVENT_ALL", be_cconst_int(LV_EVENT_ALL) },
     { "EVENT_CANCEL", be_cconst_int(LV_EVENT_CANCEL) },
@@ -300,6 +314,7 @@ const be_const_member_t lv0_constants[] = {
     { "EVENT_LEAVE", be_cconst_int(LV_EVENT_LEAVE) },
     { "EVENT_LONG_PRESSED", be_cconst_int(LV_EVENT_LONG_PRESSED) },
     { "EVENT_LONG_PRESSED_REPEAT", be_cconst_int(LV_EVENT_LONG_PRESSED_REPEAT) },
+    { "EVENT_PREPROCESS", be_cconst_int(LV_EVENT_PREPROCESS) },
     { "EVENT_PRESSED", be_cconst_int(LV_EVENT_PRESSED) },
     { "EVENT_PRESSING", be_cconst_int(LV_EVENT_PRESSING) },
     { "EVENT_PRESS_LOST", be_cconst_int(LV_EVENT_PRESS_LOST) },
@@ -420,6 +435,11 @@ const be_const_member_t lv0_constants[] = {
     { "LABEL_LONG_SCROLL_CIRCULAR", be_cconst_int(LV_LABEL_LONG_SCROLL_CIRCULAR) },
     { "LABEL_LONG_WRAP", be_cconst_int(LV_LABEL_LONG_WRAP) },
     { "LED_DRAW_PART_RECTANGLE", be_cconst_int(LV_LED_DRAW_PART_RECTANGLE) },
+    { "MENU_HEADER_BOTTOM_FIXED", be_cconst_int(LV_MENU_HEADER_BOTTOM_FIXED) },
+    { "MENU_HEADER_TOP_FIXED", be_cconst_int(LV_MENU_HEADER_TOP_FIXED) },
+    { "MENU_HEADER_TOP_UNFIXED", be_cconst_int(LV_MENU_HEADER_TOP_UNFIXED) },
+    { "MENU_ROOT_BACK_BTN_DISABLED", be_cconst_int(LV_MENU_ROOT_BACK_BTN_DISABLED) },
+    { "MENU_ROOT_BACK_BTN_ENABLED", be_cconst_int(LV_MENU_ROOT_BACK_BTN_ENABLED) },
     { "METER_DRAW_PART_ARC", be_cconst_int(LV_METER_DRAW_PART_ARC) },
     { "METER_DRAW_PART_NEEDLE_IMG", be_cconst_int(LV_METER_DRAW_PART_NEEDLE_IMG) },
     { "METER_DRAW_PART_NEEDLE_LINE", be_cconst_int(LV_METER_DRAW_PART_NEEDLE_LINE) },
@@ -449,13 +469,17 @@ const be_const_member_t lv0_constants[] = {
     { "OBJ_FLAG_IGNORE_LAYOUT", be_cconst_int(LV_OBJ_FLAG_IGNORE_LAYOUT) },
     { "OBJ_FLAG_LAYOUT_1", be_cconst_int(LV_OBJ_FLAG_LAYOUT_1) },
     { "OBJ_FLAG_LAYOUT_2", be_cconst_int(LV_OBJ_FLAG_LAYOUT_2) },
+    { "OBJ_FLAG_OVERFLOW_VISIBLE", be_cconst_int(LV_OBJ_FLAG_OVERFLOW_VISIBLE) },
     { "OBJ_FLAG_PRESS_LOCK", be_cconst_int(LV_OBJ_FLAG_PRESS_LOCK) },
     { "OBJ_FLAG_SCROLLABLE", be_cconst_int(LV_OBJ_FLAG_SCROLLABLE) },
     { "OBJ_FLAG_SCROLL_CHAIN", be_cconst_int(LV_OBJ_FLAG_SCROLL_CHAIN) },
+    { "OBJ_FLAG_SCROLL_CHAIN_HOR", be_cconst_int(LV_OBJ_FLAG_SCROLL_CHAIN_HOR) },
+    { "OBJ_FLAG_SCROLL_CHAIN_VER", be_cconst_int(LV_OBJ_FLAG_SCROLL_CHAIN_VER) },
     { "OBJ_FLAG_SCROLL_ELASTIC", be_cconst_int(LV_OBJ_FLAG_SCROLL_ELASTIC) },
     { "OBJ_FLAG_SCROLL_MOMENTUM", be_cconst_int(LV_OBJ_FLAG_SCROLL_MOMENTUM) },
     { "OBJ_FLAG_SCROLL_ONE", be_cconst_int(LV_OBJ_FLAG_SCROLL_ONE) },
     { "OBJ_FLAG_SCROLL_ON_FOCUS", be_cconst_int(LV_OBJ_FLAG_SCROLL_ON_FOCUS) },
+    { "OBJ_FLAG_SCROLL_WITH_ARROW", be_cconst_int(LV_OBJ_FLAG_SCROLL_WITH_ARROW) },
     { "OBJ_FLAG_SNAPPABLE", be_cconst_int(LV_OBJ_FLAG_SNAPPABLE) },
     { "OBJ_FLAG_USER_1", be_cconst_int(LV_OBJ_FLAG_USER_1) },
     { "OBJ_FLAG_USER_2", be_cconst_int(LV_OBJ_FLAG_USER_2) },
@@ -570,6 +594,8 @@ const be_const_member_t lv0_constants[] = {
     { "STYLE_BASE_DIR", be_cconst_int(LV_STYLE_BASE_DIR) },
     { "STYLE_BG_COLOR", be_cconst_int(LV_STYLE_BG_COLOR) },
     { "STYLE_BG_COLOR_FILTERED", be_cconst_int(LV_STYLE_BG_COLOR_FILTERED) },
+    { "STYLE_BG_DITHER_MODE", be_cconst_int(LV_STYLE_BG_DITHER_MODE) },
+    { "STYLE_BG_GRAD", be_cconst_int(LV_STYLE_BG_GRAD) },
     { "STYLE_BG_GRAD_COLOR", be_cconst_int(LV_STYLE_BG_GRAD_COLOR) },
     { "STYLE_BG_GRAD_COLOR_FILTERED", be_cconst_int(LV_STYLE_BG_GRAD_COLOR_FILTERED) },
     { "STYLE_BG_GRAD_DIR", be_cconst_int(LV_STYLE_BG_GRAD_DIR) },
diff --git a/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c
index 88141c5eb..f900e51ce 100644
--- a/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c
+++ b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c
@@ -50,11 +50,11 @@ extern int lvbe_style_set_prop(bvm *vm);
 extern int lvbe_style_get_prop(bvm *vm);
 extern int lvbe_style_get_prop_inlined(bvm *vm);
 extern int lvbe_style_is_empty(bvm *vm);
+extern int lvbe_style_set_size(bvm *vm);
 extern int lvbe_style_set_pad_all(bvm *vm);
 extern int lvbe_style_set_pad_hor(bvm *vm);
 extern int lvbe_style_set_pad_ver(bvm *vm);
 extern int lvbe_style_set_pad_gap(bvm *vm);
-extern int lvbe_style_set_size(bvm *vm);
 extern int lvbe_style_set_width(bvm *vm);
 extern int lvbe_style_set_min_width(bvm *vm);
 extern int lvbe_style_set_max_width(bvm *vm);
@@ -76,17 +76,6 @@ extern int lvbe_style_set_pad_left(bvm *vm);
 extern int lvbe_style_set_pad_right(bvm *vm);
 extern int lvbe_style_set_pad_row(bvm *vm);
 extern int lvbe_style_set_pad_column(bvm *vm);
-extern int lvbe_style_set_radius(bvm *vm);
-extern int lvbe_style_set_clip_corner(bvm *vm);
-extern int lvbe_style_set_opa(bvm *vm);
-extern int lvbe_style_set_color_filter_dsc(bvm *vm);
-extern int lvbe_style_set_color_filter_opa(bvm *vm);
-extern int lvbe_style_set_anim_time(bvm *vm);
-extern int lvbe_style_set_anim_speed(bvm *vm);
-extern int lvbe_style_set_transition(bvm *vm);
-extern int lvbe_style_set_blend_mode(bvm *vm);
-extern int lvbe_style_set_layout(bvm *vm);
-extern int lvbe_style_set_base_dir(bvm *vm);
 extern int lvbe_style_set_bg_color(bvm *vm);
 extern int lvbe_style_set_bg_color_filtered(bvm *vm);
 extern int lvbe_style_set_bg_opa(bvm *vm);
@@ -95,6 +84,8 @@ extern int lvbe_style_set_bg_grad_color_filtered(bvm *vm);
 extern int lvbe_style_set_bg_grad_dir(bvm *vm);
 extern int lvbe_style_set_bg_main_stop(bvm *vm);
 extern int lvbe_style_set_bg_grad_stop(bvm *vm);
+extern int lvbe_style_set_bg_grad(bvm *vm);
+extern int lvbe_style_set_bg_dither_mode(bvm *vm);
 extern int lvbe_style_set_bg_img_src(bvm *vm);
 extern int lvbe_style_set_bg_img_opa(bvm *vm);
 extern int lvbe_style_set_bg_img_recolor(bvm *vm);
@@ -107,18 +98,6 @@ extern int lvbe_style_set_border_opa(bvm *vm);
 extern int lvbe_style_set_border_width(bvm *vm);
 extern int lvbe_style_set_border_side(bvm *vm);
 extern int lvbe_style_set_border_post(bvm *vm);
-extern int lvbe_style_set_text_color(bvm *vm);
-extern int lvbe_style_set_text_color_filtered(bvm *vm);
-extern int lvbe_style_set_text_opa(bvm *vm);
-extern int lvbe_style_set_text_font(bvm *vm);
-extern int lvbe_style_set_text_letter_space(bvm *vm);
-extern int lvbe_style_set_text_line_space(bvm *vm);
-extern int lvbe_style_set_text_decor(bvm *vm);
-extern int lvbe_style_set_text_align(bvm *vm);
-extern int lvbe_style_set_img_opa(bvm *vm);
-extern int lvbe_style_set_img_recolor(bvm *vm);
-extern int lvbe_style_set_img_recolor_filtered(bvm *vm);
-extern int lvbe_style_set_img_recolor_opa(bvm *vm);
 extern int lvbe_style_set_outline_width(bvm *vm);
 extern int lvbe_style_set_outline_color(bvm *vm);
 extern int lvbe_style_set_outline_color_filtered(bvm *vm);
@@ -131,6 +110,10 @@ extern int lvbe_style_set_shadow_spread(bvm *vm);
 extern int lvbe_style_set_shadow_color(bvm *vm);
 extern int lvbe_style_set_shadow_color_filtered(bvm *vm);
 extern int lvbe_style_set_shadow_opa(bvm *vm);
+extern int lvbe_style_set_img_opa(bvm *vm);
+extern int lvbe_style_set_img_recolor(bvm *vm);
+extern int lvbe_style_set_img_recolor_filtered(bvm *vm);
+extern int lvbe_style_set_img_recolor_opa(bvm *vm);
 extern int lvbe_style_set_line_width(bvm *vm);
 extern int lvbe_style_set_line_dash_width(bvm *vm);
 extern int lvbe_style_set_line_dash_gap(bvm *vm);
@@ -144,6 +127,25 @@ extern int lvbe_style_set_arc_color(bvm *vm);
 extern int lvbe_style_set_arc_color_filtered(bvm *vm);
 extern int lvbe_style_set_arc_opa(bvm *vm);
 extern int lvbe_style_set_arc_img_src(bvm *vm);
+extern int lvbe_style_set_text_color(bvm *vm);
+extern int lvbe_style_set_text_color_filtered(bvm *vm);
+extern int lvbe_style_set_text_opa(bvm *vm);
+extern int lvbe_style_set_text_font(bvm *vm);
+extern int lvbe_style_set_text_letter_space(bvm *vm);
+extern int lvbe_style_set_text_line_space(bvm *vm);
+extern int lvbe_style_set_text_decor(bvm *vm);
+extern int lvbe_style_set_text_align(bvm *vm);
+extern int lvbe_style_set_radius(bvm *vm);
+extern int lvbe_style_set_clip_corner(bvm *vm);
+extern int lvbe_style_set_opa(bvm *vm);
+extern int lvbe_style_set_color_filter_dsc(bvm *vm);
+extern int lvbe_style_set_color_filter_opa(bvm *vm);
+extern int lvbe_style_set_anim_time(bvm *vm);
+extern int lvbe_style_set_anim_speed(bvm *vm);
+extern int lvbe_style_set_transition(bvm *vm);
+extern int lvbe_style_set_blend_mode(bvm *vm);
+extern int lvbe_style_set_layout(bvm *vm);
+extern int lvbe_style_set_base_dir(bvm *vm);
 
 /* `lv_font` external functions definitions */
 
@@ -192,6 +194,7 @@ extern int lvbe_obj_add_event_cb(bvm *vm);
 extern int lvbe_obj_remove_event_cb(bvm *vm);
 extern int lvbe_obj_remove_event_cb_with_user_data(bvm *vm);
 extern int lvbe_obj_remove_event_dsc(bvm *vm);
+extern int lvbe_obj_get_event_user_data(bvm *vm);
 extern int lvbe_obj_create(bvm *vm);
 extern int lvbe_obj_add_flag(bvm *vm);
 extern int lvbe_obj_clear_flag(bvm *vm);
@@ -242,6 +245,8 @@ extern int lvbe_obj_get_x(bvm *vm);
 extern int lvbe_obj_get_x2(bvm *vm);
 extern int lvbe_obj_get_y(bvm *vm);
 extern int lvbe_obj_get_y2(bvm *vm);
+extern int lvbe_obj_get_x_aligned(bvm *vm);
+extern int lvbe_obj_get_y_aligned(bvm *vm);
 extern int lvbe_obj_get_width(bvm *vm);
 extern int lvbe_obj_get_height(bvm *vm);
 extern int lvbe_obj_get_content_width(bvm *vm);
@@ -276,6 +281,7 @@ extern int lvbe_obj_get_scroll_left(bvm *vm);
 extern int lvbe_obj_get_scroll_right(bvm *vm);
 extern int lvbe_obj_get_scroll_end(bvm *vm);
 extern int lvbe_obj_scroll_by(bvm *vm);
+extern int lvbe_obj_scroll_by_bounded(bvm *vm);
 extern int lvbe_obj_scroll_to(bvm *vm);
 extern int lvbe_obj_scroll_to_x(bvm *vm);
 extern int lvbe_obj_scroll_to_y(bvm *vm);
@@ -302,8 +308,6 @@ extern int lvbe_obj_set_style_pad_ver(bvm *vm);
 extern int lvbe_obj_set_style_pad_gap(bvm *vm);
 extern int lvbe_obj_set_style_size(bvm *vm);
 extern int lvbe_obj_calculate_style_text_align(bvm *vm);
-extern int lvbe_obj_get_x_aligned(bvm *vm);
-extern int lvbe_obj_get_y_aligned(bvm *vm);
 extern int lvbe_obj_get_style_width(bvm *vm);
 extern int lvbe_obj_get_style_min_width(bvm *vm);
 extern int lvbe_obj_get_style_max_width(bvm *vm);
@@ -325,17 +329,6 @@ extern int lvbe_obj_get_style_pad_left(bvm *vm);
 extern int lvbe_obj_get_style_pad_right(bvm *vm);
 extern int lvbe_obj_get_style_pad_row(bvm *vm);
 extern int lvbe_obj_get_style_pad_column(bvm *vm);
-extern int lvbe_obj_get_style_radius(bvm *vm);
-extern int lvbe_obj_get_style_clip_corner(bvm *vm);
-extern int lvbe_obj_get_style_opa(bvm *vm);
-extern int lvbe_obj_get_style_color_filter_dsc(bvm *vm);
-extern int lvbe_obj_get_style_color_filter_opa(bvm *vm);
-extern int lvbe_obj_get_style_anim_time(bvm *vm);
-extern int lvbe_obj_get_style_anim_speed(bvm *vm);
-extern int lvbe_obj_get_style_transition(bvm *vm);
-extern int lvbe_obj_get_style_blend_mode(bvm *vm);
-extern int lvbe_obj_get_style_layout(bvm *vm);
-extern int lvbe_obj_get_style_base_dir(bvm *vm);
 extern int lvbe_obj_get_style_bg_color(bvm *vm);
 extern int lvbe_obj_get_style_bg_color_filtered(bvm *vm);
 extern int lvbe_obj_get_style_bg_opa(bvm *vm);
@@ -344,6 +337,8 @@ extern int lvbe_obj_get_style_bg_grad_color_filtered(bvm *vm);
 extern int lvbe_obj_get_style_bg_grad_dir(bvm *vm);
 extern int lvbe_obj_get_style_bg_main_stop(bvm *vm);
 extern int lvbe_obj_get_style_bg_grad_stop(bvm *vm);
+extern int lvbe_obj_get_style_bg_grad(bvm *vm);
+extern int lvbe_obj_get_style_bg_dither_mode(bvm *vm);
 extern int lvbe_obj_get_style_bg_img_src(bvm *vm);
 extern int lvbe_obj_get_style_bg_img_opa(bvm *vm);
 extern int lvbe_obj_get_style_bg_img_recolor(bvm *vm);
@@ -356,18 +351,6 @@ extern int lvbe_obj_get_style_border_opa(bvm *vm);
 extern int lvbe_obj_get_style_border_width(bvm *vm);
 extern int lvbe_obj_get_style_border_side(bvm *vm);
 extern int lvbe_obj_get_style_border_post(bvm *vm);
-extern int lvbe_obj_get_style_text_color(bvm *vm);
-extern int lvbe_obj_get_style_text_color_filtered(bvm *vm);
-extern int lvbe_obj_get_style_text_opa(bvm *vm);
-extern int lvbe_obj_get_style_text_font(bvm *vm);
-extern int lvbe_obj_get_style_text_letter_space(bvm *vm);
-extern int lvbe_obj_get_style_text_line_space(bvm *vm);
-extern int lvbe_obj_get_style_text_decor(bvm *vm);
-extern int lvbe_obj_get_style_text_align(bvm *vm);
-extern int lvbe_obj_get_style_img_opa(bvm *vm);
-extern int lvbe_obj_get_style_img_recolor(bvm *vm);
-extern int lvbe_obj_get_style_img_recolor_filtered(bvm *vm);
-extern int lvbe_obj_get_style_img_recolor_opa(bvm *vm);
 extern int lvbe_obj_get_style_outline_width(bvm *vm);
 extern int lvbe_obj_get_style_outline_color(bvm *vm);
 extern int lvbe_obj_get_style_outline_color_filtered(bvm *vm);
@@ -380,6 +363,10 @@ extern int lvbe_obj_get_style_shadow_spread(bvm *vm);
 extern int lvbe_obj_get_style_shadow_color(bvm *vm);
 extern int lvbe_obj_get_style_shadow_color_filtered(bvm *vm);
 extern int lvbe_obj_get_style_shadow_opa(bvm *vm);
+extern int lvbe_obj_get_style_img_opa(bvm *vm);
+extern int lvbe_obj_get_style_img_recolor(bvm *vm);
+extern int lvbe_obj_get_style_img_recolor_filtered(bvm *vm);
+extern int lvbe_obj_get_style_img_recolor_opa(bvm *vm);
 extern int lvbe_obj_get_style_line_width(bvm *vm);
 extern int lvbe_obj_get_style_line_dash_width(bvm *vm);
 extern int lvbe_obj_get_style_line_dash_gap(bvm *vm);
@@ -393,6 +380,25 @@ extern int lvbe_obj_get_style_arc_color(bvm *vm);
 extern int lvbe_obj_get_style_arc_color_filtered(bvm *vm);
 extern int lvbe_obj_get_style_arc_opa(bvm *vm);
 extern int lvbe_obj_get_style_arc_img_src(bvm *vm);
+extern int lvbe_obj_get_style_text_color(bvm *vm);
+extern int lvbe_obj_get_style_text_color_filtered(bvm *vm);
+extern int lvbe_obj_get_style_text_opa(bvm *vm);
+extern int lvbe_obj_get_style_text_font(bvm *vm);
+extern int lvbe_obj_get_style_text_letter_space(bvm *vm);
+extern int lvbe_obj_get_style_text_line_space(bvm *vm);
+extern int lvbe_obj_get_style_text_decor(bvm *vm);
+extern int lvbe_obj_get_style_text_align(bvm *vm);
+extern int lvbe_obj_get_style_radius(bvm *vm);
+extern int lvbe_obj_get_style_clip_corner(bvm *vm);
+extern int lvbe_obj_get_style_opa(bvm *vm);
+extern int lvbe_obj_get_style_color_filter_dsc(bvm *vm);
+extern int lvbe_obj_get_style_color_filter_opa(bvm *vm);
+extern int lvbe_obj_get_style_anim_time(bvm *vm);
+extern int lvbe_obj_get_style_anim_speed(bvm *vm);
+extern int lvbe_obj_get_style_transition(bvm *vm);
+extern int lvbe_obj_get_style_blend_mode(bvm *vm);
+extern int lvbe_obj_get_style_layout(bvm *vm);
+extern int lvbe_obj_get_style_base_dir(bvm *vm);
 extern int lvbe_obj_set_style_width(bvm *vm);
 extern int lvbe_obj_set_style_min_width(bvm *vm);
 extern int lvbe_obj_set_style_max_width(bvm *vm);
@@ -414,17 +420,6 @@ extern int lvbe_obj_set_style_pad_left(bvm *vm);
 extern int lvbe_obj_set_style_pad_right(bvm *vm);
 extern int lvbe_obj_set_style_pad_row(bvm *vm);
 extern int lvbe_obj_set_style_pad_column(bvm *vm);
-extern int lvbe_obj_set_style_radius(bvm *vm);
-extern int lvbe_obj_set_style_clip_corner(bvm *vm);
-extern int lvbe_obj_set_style_opa(bvm *vm);
-extern int lvbe_obj_set_style_color_filter_dsc(bvm *vm);
-extern int lvbe_obj_set_style_color_filter_opa(bvm *vm);
-extern int lvbe_obj_set_style_anim_time(bvm *vm);
-extern int lvbe_obj_set_style_anim_speed(bvm *vm);
-extern int lvbe_obj_set_style_transition(bvm *vm);
-extern int lvbe_obj_set_style_blend_mode(bvm *vm);
-extern int lvbe_obj_set_style_layout(bvm *vm);
-extern int lvbe_obj_set_style_base_dir(bvm *vm);
 extern int lvbe_obj_set_style_bg_color(bvm *vm);
 extern int lvbe_obj_set_style_bg_color_filtered(bvm *vm);
 extern int lvbe_obj_set_style_bg_opa(bvm *vm);
@@ -433,6 +428,8 @@ extern int lvbe_obj_set_style_bg_grad_color_filtered(bvm *vm);
 extern int lvbe_obj_set_style_bg_grad_dir(bvm *vm);
 extern int lvbe_obj_set_style_bg_main_stop(bvm *vm);
 extern int lvbe_obj_set_style_bg_grad_stop(bvm *vm);
+extern int lvbe_obj_set_style_bg_grad(bvm *vm);
+extern int lvbe_obj_set_style_bg_dither_mode(bvm *vm);
 extern int lvbe_obj_set_style_bg_img_src(bvm *vm);
 extern int lvbe_obj_set_style_bg_img_opa(bvm *vm);
 extern int lvbe_obj_set_style_bg_img_recolor(bvm *vm);
@@ -445,18 +442,6 @@ extern int lvbe_obj_set_style_border_opa(bvm *vm);
 extern int lvbe_obj_set_style_border_width(bvm *vm);
 extern int lvbe_obj_set_style_border_side(bvm *vm);
 extern int lvbe_obj_set_style_border_post(bvm *vm);
-extern int lvbe_obj_set_style_text_color(bvm *vm);
-extern int lvbe_obj_set_style_text_color_filtered(bvm *vm);
-extern int lvbe_obj_set_style_text_opa(bvm *vm);
-extern int lvbe_obj_set_style_text_font(bvm *vm);
-extern int lvbe_obj_set_style_text_letter_space(bvm *vm);
-extern int lvbe_obj_set_style_text_line_space(bvm *vm);
-extern int lvbe_obj_set_style_text_decor(bvm *vm);
-extern int lvbe_obj_set_style_text_align(bvm *vm);
-extern int lvbe_obj_set_style_img_opa(bvm *vm);
-extern int lvbe_obj_set_style_img_recolor(bvm *vm);
-extern int lvbe_obj_set_style_img_recolor_filtered(bvm *vm);
-extern int lvbe_obj_set_style_img_recolor_opa(bvm *vm);
 extern int lvbe_obj_set_style_outline_width(bvm *vm);
 extern int lvbe_obj_set_style_outline_color(bvm *vm);
 extern int lvbe_obj_set_style_outline_color_filtered(bvm *vm);
@@ -469,6 +454,10 @@ extern int lvbe_obj_set_style_shadow_spread(bvm *vm);
 extern int lvbe_obj_set_style_shadow_color(bvm *vm);
 extern int lvbe_obj_set_style_shadow_color_filtered(bvm *vm);
 extern int lvbe_obj_set_style_shadow_opa(bvm *vm);
+extern int lvbe_obj_set_style_img_opa(bvm *vm);
+extern int lvbe_obj_set_style_img_recolor(bvm *vm);
+extern int lvbe_obj_set_style_img_recolor_filtered(bvm *vm);
+extern int lvbe_obj_set_style_img_recolor_opa(bvm *vm);
 extern int lvbe_obj_set_style_line_width(bvm *vm);
 extern int lvbe_obj_set_style_line_dash_width(bvm *vm);
 extern int lvbe_obj_set_style_line_dash_gap(bvm *vm);
@@ -482,6 +471,25 @@ extern int lvbe_obj_set_style_arc_color(bvm *vm);
 extern int lvbe_obj_set_style_arc_color_filtered(bvm *vm);
 extern int lvbe_obj_set_style_arc_opa(bvm *vm);
 extern int lvbe_obj_set_style_arc_img_src(bvm *vm);
+extern int lvbe_obj_set_style_text_color(bvm *vm);
+extern int lvbe_obj_set_style_text_color_filtered(bvm *vm);
+extern int lvbe_obj_set_style_text_opa(bvm *vm);
+extern int lvbe_obj_set_style_text_font(bvm *vm);
+extern int lvbe_obj_set_style_text_letter_space(bvm *vm);
+extern int lvbe_obj_set_style_text_line_space(bvm *vm);
+extern int lvbe_obj_set_style_text_decor(bvm *vm);
+extern int lvbe_obj_set_style_text_align(bvm *vm);
+extern int lvbe_obj_set_style_radius(bvm *vm);
+extern int lvbe_obj_set_style_clip_corner(bvm *vm);
+extern int lvbe_obj_set_style_opa(bvm *vm);
+extern int lvbe_obj_set_style_color_filter_dsc(bvm *vm);
+extern int lvbe_obj_set_style_color_filter_opa(bvm *vm);
+extern int lvbe_obj_set_style_anim_time(bvm *vm);
+extern int lvbe_obj_set_style_anim_speed(bvm *vm);
+extern int lvbe_obj_set_style_transition(bvm *vm);
+extern int lvbe_obj_set_style_blend_mode(bvm *vm);
+extern int lvbe_obj_set_style_layout(bvm *vm);
+extern int lvbe_obj_set_style_base_dir(bvm *vm);
 extern int lvbe_obj_del(bvm *vm);
 extern int lvbe_obj_clean(bvm *vm);
 extern int lvbe_obj_del_delayed(bvm *vm);
@@ -788,6 +796,7 @@ extern int lvbe_dropdown_get_selected_highlight(bvm *vm);
 extern int lvbe_dropdown_get_dir(bvm *vm);
 extern int lvbe_dropdown_open(bvm *vm);
 extern int lvbe_dropdown_close(bvm *vm);
+extern int lvbe_dropdown_is_open(bvm *vm);
 
 /* `lv_label` external functions definitions */
 extern int lvbe_label_create(bvm *vm);
diff --git a/lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h b/lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h
index 2e3a56461..e5ead9f94 100644
--- a/lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h
+++ b/lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h
@@ -173,6 +173,8 @@ LV_EVENT_SIZE_CHANGED
 LV_EVENT_STYLE_CHANGED
 LV_EVENT_LAYOUT_CHANGED
 LV_EVENT_GET_SELF_SIZE
+LV_EVENT_PREPROCESS
+
 // File: ../../lvgl/src/core/lv_group.h
 LV_KEY_UP
 LV_KEY_DOWN
@@ -226,8 +228,11 @@ LV_OBJ_FLAG_SCROLLABLE
 LV_OBJ_FLAG_SCROLL_ELASTIC
 LV_OBJ_FLAG_SCROLL_MOMENTUM
 LV_OBJ_FLAG_SCROLL_ONE
+LV_OBJ_FLAG_SCROLL_CHAIN_HOR
+LV_OBJ_FLAG_SCROLL_CHAIN_VER
 LV_OBJ_FLAG_SCROLL_CHAIN
 LV_OBJ_FLAG_SCROLL_ON_FOCUS
+LV_OBJ_FLAG_SCROLL_WITH_ARROW
 LV_OBJ_FLAG_SNAPPABLE
 LV_OBJ_FLAG_PRESS_LOCK
 LV_OBJ_FLAG_EVENT_BUBBLE
@@ -235,6 +240,7 @@ LV_OBJ_FLAG_GESTURE_BUBBLE
 LV_OBJ_FLAG_ADV_HITTEST
 LV_OBJ_FLAG_IGNORE_LAYOUT
 LV_OBJ_FLAG_FLOATING
+LV_OBJ_FLAG_OVERFLOW_VISIBLE
 LV_OBJ_FLAG_LAYOUT_1
 LV_OBJ_FLAG_LAYOUT_2
 LV_OBJ_FLAG_WIDGET_1
@@ -285,7 +291,6 @@ LV_OBJ_TREE_WALK_END
 // File: ../../lvgl/src/core/lv_theme.h
 // File: ../../lvgl/src/draw/lv_draw.h
 // File: ../../lvgl/src/draw/lv_draw_arc.h
-// File: ../../lvgl/src/draw/lv_draw_blend.h
 // File: ../../lvgl/src/draw/lv_draw_img.h
 // File: ../../lvgl/src/draw/lv_draw_label.h
 // File: ../../lvgl/src/draw/lv_draw_line.h
@@ -299,6 +304,7 @@ LV_DRAW_MASK_TYPE_ANGLE
 LV_DRAW_MASK_TYPE_RADIUS
 LV_DRAW_MASK_TYPE_FADE
 LV_DRAW_MASK_TYPE_MAP
+LV_DRAW_MASK_TYPE_POLYGON
 
 LV_DRAW_MASK_LINE_SIDE_LEFT
 LV_DRAW_MASK_LINE_SIDE_RIGHT
@@ -404,6 +410,12 @@ LV_LED_DRAW_PART_RECTANGLE
 
 // File: ../../lvgl/src/extra/widgets/list/lv_list.h
 // File: ../../lvgl/src/extra/widgets/lv_widgets.h
+// File: ../../lvgl/src/extra/widgets/menu/lv_menu.h
+LV_MENU_HEADER_TOP_FIXED
+LV_MENU_HEADER_TOP_UNFIXED
+LV_MENU_HEADER_BOTTOM_FIXED
+LV_MENU_ROOT_BACK_BTN_DISABLED
+LV_MENU_ROOT_BACK_BTN_ENABLED
 // File: ../../lvgl/src/extra/widgets/meter/lv_meter.h
 LV_METER_INDICATOR_TYPE_NEEDLE_IMG
 LV_METER_INDICATOR_TYPE_NEEDLE_LINE
@@ -553,6 +565,7 @@ LV_FS_SEEK_END
 // File: ../../lvgl/src/misc/lv_gc.h
 // File: ../../lvgl/src/misc/lv_ll.h
 // File: ../../lvgl/src/misc/lv_log.h
+// File: ../../lvgl/src/misc/lv_lru.h
 // File: ../../lvgl/src/misc/lv_math.h
 // File: ../../lvgl/src/misc/lv_mem.h
 // File: ../../lvgl/src/misc/lv_printf.h
@@ -561,6 +574,7 @@ LV_BLEND_MODE_NORMAL
 LV_BLEND_MODE_ADDITIVE
 LV_BLEND_MODE_SUBTRACTIVE
 LV_BLEND_MODE_MULTIPLY
+LV_BLEND_MODE_REPLACE
 
 LV_TEXT_DECOR_NONE
 LV_TEXT_DECOR_UNDERLINE
@@ -578,6 +592,10 @@ LV_GRAD_DIR_NONE
 LV_GRAD_DIR_VER
 LV_GRAD_DIR_HOR
 
+LV_DITHER_NONE
+LV_DITHER_ORDERED
+LV_DITHER_ERR_DIFF
+
 LV_STYLE_PROP_INV
 LV_STYLE_WIDTH
 LV_STYLE_MIN_WIDTH
@@ -608,6 +626,8 @@ LV_STYLE_BG_GRAD_COLOR_FILTERED
 LV_STYLE_BG_GRAD_DIR
 LV_STYLE_BG_MAIN_STOP
 LV_STYLE_BG_GRAD_STOP
+LV_STYLE_BG_GRAD
+LV_STYLE_BG_DITHER_MODE
 LV_STYLE_BG_IMG_SRC
 LV_STYLE_BG_IMG_OPA
 LV_STYLE_BG_IMG_RECOLOR
diff --git a/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h b/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h
index 0fad203ad..efe2fa415 100644
--- a/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h
+++ b/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h
@@ -54,11 +54,14 @@ static inline lv_coord_t lv_disp_dpx(const lv_disp_t * disp, lv_coord_t n)
 // ../../lvgl/src/core/lv_event.h
 lv_res_t lv_event_send(struct _lv_obj_t * obj, lv_event_code_t event_code, void * param)
 lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
+void lv_event_stop_bubbling(lv_event_t * e)
+void lv_event_stop_processing(lv_event_t * e)
 uint32_t lv_event_register_id(void)
 struct _lv_event_dsc_t * lv_obj_add_event_cb(struct _lv_obj_t * obj, lv_event_cb_t event_cb, lv_event_code_t filter, void * user_data)
 bool lv_obj_remove_event_cb(struct _lv_obj_t * obj, lv_event_cb_t event_cb)
 bool lv_obj_remove_event_cb_with_user_data(struct _lv_obj_t * obj, lv_event_cb_t event_cb, const void * event_user_data)
 bool lv_obj_remove_event_dsc(struct _lv_obj_t * obj, struct _lv_event_dsc_t * event_dsc)
+void * lv_obj_get_event_user_data(struct _lv_obj_t * obj, lv_event_cb_t event_cb)
 void lv_event_set_ext_draw_size(lv_event_t * e, lv_coord_t size)
 void lv_event_set_cover_res(lv_event_t * e, lv_cover_res_t res)
 
@@ -143,7 +146,7 @@ void lv_obj_init_draw_img_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_img
 void lv_obj_init_draw_line_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_line_dsc_t * draw_dsc)
 void lv_obj_init_draw_arc_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_arc_dsc_t * draw_dsc)
 lv_coord_t lv_obj_calculate_ext_draw_size(struct _lv_obj_t * obj, uint32_t part)
-void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, const lv_area_t * clip_area)
+void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, lv_draw_ctx_t * draw_ctx)
 bool lv_obj_draw_part_check_type(lv_obj_draw_part_dsc_t * dsc, const struct _lv_obj_class_t * class_p, uint32_t type)
 void lv_obj_refresh_ext_draw_size(struct _lv_obj_t * obj)
 
@@ -171,6 +174,8 @@ lv_coord_t lv_obj_get_x(const struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_x2(const struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_y(const struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_y2(const struct _lv_obj_t * obj)
+lv_coord_t lv_obj_get_x_aligned(const struct _lv_obj_t * obj)
+lv_coord_t lv_obj_get_y_aligned(const struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_width(const struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_height(const struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_content_width(const struct _lv_obj_t * obj)
@@ -209,6 +214,7 @@ lv_coord_t lv_obj_get_scroll_left(struct _lv_obj_t * obj)
 lv_coord_t lv_obj_get_scroll_right(struct _lv_obj_t * obj)
 void lv_obj_get_scroll_end(struct _lv_obj_t * obj, lv_point_t * end)
 void lv_obj_scroll_by(struct _lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable_t anim_en)
+void lv_obj_scroll_by_bounded(struct _lv_obj_t * obj, lv_coord_t dx, lv_coord_t dy, lv_anim_enable_t anim_en)
 void lv_obj_scroll_to(struct _lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable_t anim_en)
 void lv_obj_scroll_to_x(struct _lv_obj_t * obj, lv_coord_t x, lv_anim_enable_t anim_en)
 void lv_obj_scroll_to_y(struct _lv_obj_t * obj, lv_coord_t y, lv_anim_enable_t anim_en)
@@ -241,8 +247,6 @@ static inline void lv_obj_set_style_pad_ver(struct _lv_obj_t * obj, lv_coord_t v
 static inline void lv_obj_set_style_pad_gap(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 static inline void lv_obj_set_style_size(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 lv_text_align_t lv_obj_calculate_style_text_align(const struct _lv_obj_t * obj, lv_part_t part, const char * txt)
-static inline lv_coord_t lv_obj_get_x_aligned(const struct _lv_obj_t * obj)
-static inline lv_coord_t lv_obj_get_y_aligned(const struct _lv_obj_t * obj)
 
 // ../../lvgl/src/core/lv_obj_style_gen.h
 static inline lv_coord_t lv_obj_get_style_width(const struct _lv_obj_t * obj, uint32_t part)
@@ -266,17 +270,6 @@ static inline lv_coord_t lv_obj_get_style_pad_left(const struct _lv_obj_t * obj,
 static inline lv_coord_t lv_obj_get_style_pad_right(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_pad_row(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_pad_column(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_coord_t lv_obj_get_style_radius(const struct _lv_obj_t * obj, uint32_t part)
-static inline bool lv_obj_get_style_clip_corner(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_opa_t lv_obj_get_style_opa(const struct _lv_obj_t * obj, uint32_t part)
-static inline const lv_color_filter_dsc_t * lv_obj_get_style_color_filter_dsc(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_opa_t lv_obj_get_style_color_filter_opa(const struct _lv_obj_t * obj, uint32_t part)
-static inline uint32_t lv_obj_get_style_anim_time(const struct _lv_obj_t * obj, uint32_t part)
-static inline uint32_t lv_obj_get_style_anim_speed(const struct _lv_obj_t * obj, uint32_t part)
-static inline const lv_style_transition_dsc_t * lv_obj_get_style_transition(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_blend_mode_t lv_obj_get_style_blend_mode(const struct _lv_obj_t * obj, uint32_t part)
-static inline uint16_t lv_obj_get_style_layout(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_base_dir_t lv_obj_get_style_base_dir(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_color_t lv_obj_get_style_bg_color(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_color_t lv_obj_get_style_bg_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_opa_t lv_obj_get_style_bg_opa(const struct _lv_obj_t * obj, uint32_t part)
@@ -285,6 +278,8 @@ static inline lv_color_t lv_obj_get_style_bg_grad_color_filtered(const struct _l
 static inline lv_grad_dir_t lv_obj_get_style_bg_grad_dir(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_bg_main_stop(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_bg_grad_stop(const struct _lv_obj_t * obj, uint32_t part)
+static inline const lv_grad_dsc_t * lv_obj_get_style_bg_grad(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_dither_mode_t lv_obj_get_style_bg_dither_mode(const struct _lv_obj_t * obj, uint32_t part)
 static inline const void * lv_obj_get_style_bg_img_src(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_opa_t lv_obj_get_style_bg_img_opa(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_color_t lv_obj_get_style_bg_img_recolor(const struct _lv_obj_t * obj, uint32_t part)
@@ -297,18 +292,6 @@ static inline lv_opa_t lv_obj_get_style_border_opa(const struct _lv_obj_t * obj,
 static inline lv_coord_t lv_obj_get_style_border_width(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_border_side_t lv_obj_get_style_border_side(const struct _lv_obj_t * obj, uint32_t part)
 static inline bool lv_obj_get_style_border_post(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_color_t lv_obj_get_style_text_color(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_color_t lv_obj_get_style_text_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_opa_t lv_obj_get_style_text_opa(const struct _lv_obj_t * obj, uint32_t part)
-static inline const lv_font_t * lv_obj_get_style_text_font(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_coord_t lv_obj_get_style_text_letter_space(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_coord_t lv_obj_get_style_text_line_space(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_text_decor_t lv_obj_get_style_text_decor(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_text_align_t lv_obj_get_style_text_align(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_opa_t lv_obj_get_style_img_opa(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_color_t lv_obj_get_style_img_recolor(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_color_t lv_obj_get_style_img_recolor_filtered(const struct _lv_obj_t * obj, uint32_t part)
-static inline lv_opa_t lv_obj_get_style_img_recolor_opa(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_outline_width(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_color_t lv_obj_get_style_outline_color(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_color_t lv_obj_get_style_outline_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
@@ -321,6 +304,10 @@ static inline lv_coord_t lv_obj_get_style_shadow_spread(const struct _lv_obj_t *
 static inline lv_color_t lv_obj_get_style_shadow_color(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_color_t lv_obj_get_style_shadow_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_opa_t lv_obj_get_style_shadow_opa(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_opa_t lv_obj_get_style_img_opa(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_color_t lv_obj_get_style_img_recolor(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_color_t lv_obj_get_style_img_recolor_filtered(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_opa_t lv_obj_get_style_img_recolor_opa(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_line_width(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_line_dash_width(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_coord_t lv_obj_get_style_line_dash_gap(const struct _lv_obj_t * obj, uint32_t part)
@@ -334,6 +321,25 @@ static inline lv_color_t lv_obj_get_style_arc_color(const struct _lv_obj_t * obj
 static inline lv_color_t lv_obj_get_style_arc_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
 static inline lv_opa_t lv_obj_get_style_arc_opa(const struct _lv_obj_t * obj, uint32_t part)
 static inline const void * lv_obj_get_style_arc_img_src(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_color_t lv_obj_get_style_text_color(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_color_t lv_obj_get_style_text_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_opa_t lv_obj_get_style_text_opa(const struct _lv_obj_t * obj, uint32_t part)
+static inline const lv_font_t * lv_obj_get_style_text_font(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_text_letter_space(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_text_line_space(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_text_decor_t lv_obj_get_style_text_decor(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_text_align_t lv_obj_get_style_text_align(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_radius(const struct _lv_obj_t * obj, uint32_t part)
+static inline bool lv_obj_get_style_clip_corner(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_opa_t lv_obj_get_style_opa(const struct _lv_obj_t * obj, uint32_t part)
+static inline const lv_color_filter_dsc_t * lv_obj_get_style_color_filter_dsc(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_opa_t lv_obj_get_style_color_filter_opa(const struct _lv_obj_t * obj, uint32_t part)
+static inline uint32_t lv_obj_get_style_anim_time(const struct _lv_obj_t * obj, uint32_t part)
+static inline uint32_t lv_obj_get_style_anim_speed(const struct _lv_obj_t * obj, uint32_t part)
+static inline const lv_style_transition_dsc_t * lv_obj_get_style_transition(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_blend_mode_t lv_obj_get_style_blend_mode(const struct _lv_obj_t * obj, uint32_t part)
+static inline uint16_t lv_obj_get_style_layout(const struct _lv_obj_t * obj, uint32_t part)
+static inline lv_base_dir_t lv_obj_get_style_base_dir(const struct _lv_obj_t * obj, uint32_t part)
 void lv_obj_set_style_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_min_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_max_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
@@ -355,17 +361,6 @@ void lv_obj_set_style_pad_left(struct _lv_obj_t * obj, lv_coord_t value, lv_styl
 void lv_obj_set_style_pad_right(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_pad_row(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_pad_column(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-void lv_obj_set_style_radius(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-void lv_obj_set_style_clip_corner(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector)
-void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector)
-void lv_obj_set_style_color_filter_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-void lv_obj_set_style_anim_time(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
-void lv_obj_set_style_anim_speed(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
-void lv_obj_set_style_transition(struct _lv_obj_t * obj, const lv_style_transition_dsc_t * value, lv_style_selector_t selector)
-void lv_obj_set_style_blend_mode(struct _lv_obj_t * obj, lv_blend_mode_t value, lv_style_selector_t selector)
-void lv_obj_set_style_layout(struct _lv_obj_t * obj, uint16_t value, lv_style_selector_t selector)
-void lv_obj_set_style_base_dir(struct _lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
@@ -374,6 +369,8 @@ void lv_obj_set_style_bg_grad_color_filtered(struct _lv_obj_t * obj, lv_color_t
 void lv_obj_set_style_bg_grad_dir(struct _lv_obj_t * obj, lv_grad_dir_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_main_stop(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_grad_stop(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_bg_grad(struct _lv_obj_t * obj, const lv_grad_dsc_t * value, lv_style_selector_t selector)
+void lv_obj_set_style_bg_dither_mode(struct _lv_obj_t * obj, lv_dither_mode_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
 void lv_obj_set_style_bg_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
@@ -386,18 +383,6 @@ void lv_obj_set_style_border_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_styl
 void lv_obj_set_style_border_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_border_side(struct _lv_obj_t * obj, lv_border_side_t value, lv_style_selector_t selector)
 void lv_obj_set_style_border_post(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector)
-void lv_obj_set_style_text_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-void lv_obj_set_style_text_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-void lv_obj_set_style_text_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-void lv_obj_set_style_text_font(struct _lv_obj_t * obj, const lv_font_t * value, lv_style_selector_t selector)
-void lv_obj_set_style_text_letter_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-void lv_obj_set_style_text_line_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-void lv_obj_set_style_text_decor(struct _lv_obj_t * obj, lv_text_decor_t value, lv_style_selector_t selector)
-void lv_obj_set_style_text_align(struct _lv_obj_t * obj, lv_text_align_t value, lv_style_selector_t selector)
-void lv_obj_set_style_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-void lv_obj_set_style_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-void lv_obj_set_style_img_recolor_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-void lv_obj_set_style_img_recolor_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
 void lv_obj_set_style_outline_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_outline_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 void lv_obj_set_style_outline_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
@@ -410,6 +395,10 @@ void lv_obj_set_style_shadow_spread(struct _lv_obj_t * obj, lv_coord_t value, lv
 void lv_obj_set_style_shadow_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 void lv_obj_set_style_shadow_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 void lv_obj_set_style_shadow_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+void lv_obj_set_style_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+void lv_obj_set_style_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+void lv_obj_set_style_img_recolor_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+void lv_obj_set_style_img_recolor_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
 void lv_obj_set_style_line_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_line_dash_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 void lv_obj_set_style_line_dash_gap(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
@@ -423,6 +412,25 @@ void lv_obj_set_style_arc_color(struct _lv_obj_t * obj, lv_color_t value, lv_sty
 void lv_obj_set_style_arc_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 void lv_obj_set_style_arc_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
 void lv_obj_set_style_arc_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector)
+void lv_obj_set_style_text_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+void lv_obj_set_style_text_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+void lv_obj_set_style_text_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+void lv_obj_set_style_text_font(struct _lv_obj_t * obj, const lv_font_t * value, lv_style_selector_t selector)
+void lv_obj_set_style_text_letter_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_text_line_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_text_decor(struct _lv_obj_t * obj, lv_text_decor_t value, lv_style_selector_t selector)
+void lv_obj_set_style_text_align(struct _lv_obj_t * obj, lv_text_align_t value, lv_style_selector_t selector)
+void lv_obj_set_style_radius(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_clip_corner(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector)
+void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector)
+void lv_obj_set_style_color_filter_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+void lv_obj_set_style_anim_time(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
+void lv_obj_set_style_anim_speed(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
+void lv_obj_set_style_transition(struct _lv_obj_t * obj, const lv_style_transition_dsc_t * value, lv_style_selector_t selector)
+void lv_obj_set_style_blend_mode(struct _lv_obj_t * obj, lv_blend_mode_t value, lv_style_selector_t selector)
+void lv_obj_set_style_layout(struct _lv_obj_t * obj, uint16_t value, lv_style_selector_t selector)
+void lv_obj_set_style_base_dir(struct _lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector)
 
 // ../../lvgl/src/core/lv_obj_tree.h
 void lv_obj_del(struct _lv_obj_t * obj)
@@ -443,6 +451,7 @@ void lv_obj_tree_walk(struct _lv_obj_t * start_obj, lv_obj_tree_walk_cb_t cb, vo
 
 // ../../lvgl/src/core/lv_refr.h
 void lv_refr_now(lv_disp_t * disp)
+void lv_refr_obj(lv_draw_ctx_t * draw_ctx, lv_obj_t * obj)
 
 // ../../lvgl/src/core/lv_theme.h
 lv_theme_t * lv_theme_get_from_obj(lv_obj_t * obj)
@@ -456,34 +465,34 @@ lv_color_t lv_theme_get_color_primary(lv_obj_t * obj)
 lv_color_t lv_theme_get_color_secondary(lv_obj_t * obj)
 
 // ../../lvgl/src/draw/lv_draw.h
+void lv_draw_init(void)
 
 // ../../lvgl/src/draw/lv_draw_arc.h
 void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc)
-void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uint16_t start_angle, uint16_t end_angle, const lv_area_t * clip_area, const lv_draw_arc_dsc_t * dsc)
+void lv_draw_arc(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center, uint16_t radius, uint16_t start_angle, uint16_t end_angle)
 void lv_draw_arc_get_area(lv_coord_t x, lv_coord_t y, uint16_t radius, uint16_t start_angle, uint16_t end_angle, lv_coord_t w, bool rounded, lv_area_t * area)
 
-// ../../lvgl/src/draw/lv_draw_blend.h
-
 // ../../lvgl/src/draw/lv_draw_img.h
 void lv_draw_img_dsc_init(lv_draw_img_dsc_t * dsc)
-void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void * src, const lv_draw_img_dsc_t * dsc)
+void lv_draw_img(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc, const lv_area_t * coords, const void * src)
+void lv_draw_img_decoded(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc, const lv_area_t * coords, const uint8_t * map_p, lv_img_cf_t color_format)
 lv_img_src_t lv_img_src_get_type(const void * src)
 
 // ../../lvgl/src/draw/lv_draw_label.h
 void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc)
-void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_label_dsc_t * dsc, const char * txt, lv_draw_label_hint_t * hint)
-void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * clip_area, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
+void lv_draw_label(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc, const lv_area_t * coords, const char * txt, lv_draw_label_hint_t * hint)
+void lv_draw_letter(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc, const lv_point_t * pos_p, uint32_t letter)
 
 // ../../lvgl/src/draw/lv_draw_line.h
-void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip, const lv_draw_line_dsc_t * dsc)
 void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc)
+void lv_draw_line(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc, const lv_point_t * point1, const lv_point_t * point2)
 
 // ../../lvgl/src/draw/lv_draw_mask.h
 static inline uint8_t lv_draw_mask_get_cnt(void)
 static inline bool lv_draw_mask_is_any(const lv_area_t * a)
 int16_t lv_draw_mask_add(void * param, void * custom_id)
 lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len)
-lv_draw_mask_res_t lv_draw_mask_apply_ids(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len, const int16_t *ids, int16_t ids_count)
+lv_draw_mask_res_t lv_draw_mask_apply_ids(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len, const int16_t * ids, int16_t ids_count)
 void * lv_draw_mask_remove_id(int16_t id)
 void * lv_draw_mask_remove_custom(void * custom_id)
 void lv_draw_mask_free_param(void * p)
@@ -495,14 +504,15 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert
 void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area_t * rect, lv_coord_t radius, bool inv)
 void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top, lv_opa_t opa_bottom, lv_coord_t y_bottom)
 void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * coords, const lv_opa_t * map)
+void lv_draw_mask_polygon_init(lv_draw_mask_polygon_param_t * param, const lv_point_t * points, uint16_t point_cnt)
 
 // ../../lvgl/src/draw/lv_draw_rect.h
 void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc)
-void lv_draw_rect(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
+void lv_draw_rect(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
 
 // ../../lvgl/src/draw/lv_draw_triangle.h
-void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip, const lv_draw_rect_dsc_t * draw_dsc)
-void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * mask, const lv_draw_rect_dsc_t * draw_dsc)
+void lv_draw_polygon(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t points[], uint16_t point_cnt)
+void lv_draw_triangle(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t points[])
 
 // ../../lvgl/src/draw/lv_img_buf.h
 
@@ -570,6 +580,11 @@ static inline lv_coord_t lv_obj_get_style_grid_cell_y_align(const lv_obj_t * obj
 
 // ../../lvgl/src/extra/layouts/lv_layouts.h
 
+// ../../lvgl/src/extra/libs/qrcode/lv_qrcode.h
+lv_obj_t * lv_qrcode_create(lv_obj_t * parent, lv_coord_t size, lv_color_t dark_color, lv_color_t light_color)
+lv_res_t lv_qrcode_update(lv_obj_t * qrcode, const void * data, uint32_t data_len)
+void lv_qrcode_delete(lv_obj_t * qrcode)
+
 // ../../lvgl/src/extra/themes/default/lv_theme_default.h
 lv_theme_t * lv_theme_default_init(lv_disp_t * disp, lv_color_t color_primary, lv_color_t color_secondary, bool dark, const lv_font_t * font)
 lv_theme_t * lv_theme_default_get(void)
@@ -676,7 +691,7 @@ void lv_spinbox_set_step(lv_obj_t * obj, uint32_t step)
 void lv_spinbox_set_range(lv_obj_t * obj, int32_t range_min, int32_t range_max)
 void lv_spinbox_set_pos(lv_obj_t * obj, uint8_t pos)
 void lv_spinbox_set_digit_step_direction(lv_obj_t * obj, lv_dir_t direction)
-bool lv_spinbox_get_rollover(lv_obj_t *obj)
+bool lv_spinbox_get_rollover(lv_obj_t * obj)
 int32_t lv_spinbox_get_value(lv_obj_t * obj)
 int32_t lv_spinbox_get_step(lv_obj_t * obj)
 void lv_spinbox_step_next(lv_obj_t * obj)
@@ -727,16 +742,16 @@ void lv_style_reset(lv_style_t * style)
 lv_style_prop_t lv_style_register_prop(void)
 bool lv_style_remove_prop(lv_style_t * style, lv_style_prop_t prop)
 void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_t value)
-lv_res_t lv_style_get_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
-static inline lv_res_t lv_style_get_prop_inlined(lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
+lv_res_t lv_style_get_prop(const lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
+static inline lv_res_t lv_style_get_prop_inlined(const lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
 void lv_style_transition_dsc_init(lv_style_transition_dsc_t * tr, const lv_style_prop_t props[], lv_anim_path_cb_t path_cb, uint32_t time, uint32_t delay, void * user_data)
 lv_style_value_t lv_style_prop_get_default(lv_style_prop_t prop)
 bool lv_style_is_empty(const lv_style_t * style)
+static inline void lv_style_set_size(lv_style_t * style, lv_coord_t value)
 static inline void lv_style_set_pad_all(lv_style_t * style, lv_coord_t value)
 static inline void lv_style_set_pad_hor(lv_style_t * style, lv_coord_t value)
 static inline void lv_style_set_pad_ver(lv_style_t * style, lv_coord_t value)
 static inline void lv_style_set_pad_gap(lv_style_t * style, lv_coord_t value)
-static inline void lv_style_set_size(lv_style_t * style, lv_coord_t value)
 
 // ../../lvgl/src/misc/lv_style_gen.h
 void lv_style_set_width(lv_style_t * style, lv_coord_t value)
@@ -760,17 +775,6 @@ void lv_style_set_pad_left(lv_style_t * style, lv_coord_t value)
 void lv_style_set_pad_right(lv_style_t * style, lv_coord_t value)
 void lv_style_set_pad_row(lv_style_t * style, lv_coord_t value)
 void lv_style_set_pad_column(lv_style_t * style, lv_coord_t value)
-void lv_style_set_radius(lv_style_t * style, lv_coord_t value)
-void lv_style_set_clip_corner(lv_style_t * style, bool value)
-void lv_style_set_opa(lv_style_t * style, lv_opa_t value)
-void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value)
-void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value)
-void lv_style_set_anim_time(lv_style_t * style, uint32_t value)
-void lv_style_set_anim_speed(lv_style_t * style, uint32_t value)
-void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value)
-void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value)
-void lv_style_set_layout(lv_style_t * style, uint16_t value)
-void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value)
 void lv_style_set_bg_color(lv_style_t * style, lv_color_t value)
 void lv_style_set_bg_color_filtered(lv_style_t * style, lv_color_t value)
 void lv_style_set_bg_opa(lv_style_t * style, lv_opa_t value)
@@ -779,6 +783,8 @@ void lv_style_set_bg_grad_color_filtered(lv_style_t * style, lv_color_t value)
 void lv_style_set_bg_grad_dir(lv_style_t * style, lv_grad_dir_t value)
 void lv_style_set_bg_main_stop(lv_style_t * style, lv_coord_t value)
 void lv_style_set_bg_grad_stop(lv_style_t * style, lv_coord_t value)
+void lv_style_set_bg_grad(lv_style_t * style, const lv_grad_dsc_t * value)
+void lv_style_set_bg_dither_mode(lv_style_t * style, lv_dither_mode_t value)
 void lv_style_set_bg_img_src(lv_style_t * style, const void * value)
 void lv_style_set_bg_img_opa(lv_style_t * style, lv_opa_t value)
 void lv_style_set_bg_img_recolor(lv_style_t * style, lv_color_t value)
@@ -791,18 +797,6 @@ void lv_style_set_border_opa(lv_style_t * style, lv_opa_t value)
 void lv_style_set_border_width(lv_style_t * style, lv_coord_t value)
 void lv_style_set_border_side(lv_style_t * style, lv_border_side_t value)
 void lv_style_set_border_post(lv_style_t * style, bool value)
-void lv_style_set_text_color(lv_style_t * style, lv_color_t value)
-void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value)
-void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value)
-void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value)
-void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value)
-void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value)
-void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value)
-void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value)
-void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value)
-void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value)
-void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value)
-void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value)
 void lv_style_set_outline_width(lv_style_t * style, lv_coord_t value)
 void lv_style_set_outline_color(lv_style_t * style, lv_color_t value)
 void lv_style_set_outline_color_filtered(lv_style_t * style, lv_color_t value)
@@ -815,6 +809,10 @@ void lv_style_set_shadow_spread(lv_style_t * style, lv_coord_t value)
 void lv_style_set_shadow_color(lv_style_t * style, lv_color_t value)
 void lv_style_set_shadow_color_filtered(lv_style_t * style, lv_color_t value)
 void lv_style_set_shadow_opa(lv_style_t * style, lv_opa_t value)
+void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value)
+void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value)
+void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value)
+void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value)
 void lv_style_set_line_width(lv_style_t * style, lv_coord_t value)
 void lv_style_set_line_dash_width(lv_style_t * style, lv_coord_t value)
 void lv_style_set_line_dash_gap(lv_style_t * style, lv_coord_t value)
@@ -828,6 +826,25 @@ void lv_style_set_arc_color(lv_style_t * style, lv_color_t value)
 void lv_style_set_arc_color_filtered(lv_style_t * style, lv_color_t value)
 void lv_style_set_arc_opa(lv_style_t * style, lv_opa_t value)
 void lv_style_set_arc_img_src(lv_style_t * style, const void * value)
+void lv_style_set_text_color(lv_style_t * style, lv_color_t value)
+void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value)
+void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value)
+void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value)
+void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value)
+void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value)
+void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value)
+void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value)
+void lv_style_set_radius(lv_style_t * style, lv_coord_t value)
+void lv_style_set_clip_corner(lv_style_t * style, bool value)
+void lv_style_set_opa(lv_style_t * style, lv_opa_t value)
+void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value)
+void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value)
+void lv_style_set_anim_time(lv_style_t * style, uint32_t value)
+void lv_style_set_anim_speed(lv_style_t * style, uint32_t value)
+void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value)
+void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value)
+void lv_style_set_layout(lv_style_t * style, uint16_t value)
+void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value)
 
 // ../../lvgl/src/widgets/lv_arc.h
 lv_obj_t * lv_arc_create(lv_obj_t * parent)
@@ -932,6 +949,7 @@ bool lv_dropdown_get_selected_highlight(lv_obj_t * obj)
 lv_dir_t lv_dropdown_get_dir(const lv_obj_t * obj)
 void lv_dropdown_open(lv_obj_t * dropdown_obj)
 void lv_dropdown_close(lv_obj_t * obj)
+bool lv_dropdown_is_open(lv_obj_t * obj)
 
 // ../../lvgl/src/widgets/lv_img.h
 lv_obj_t * lv_img_create(lv_obj_t * parent)
diff --git a/lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c b/lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c
index 58101069e..bdadb12b5 100644
--- a/lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c
+++ b/lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c
@@ -32,40 +32,66 @@ const be_ctypes_structure_t be_lv_area = {
     { "y2", 6, 0, 0, ctypes_i16, 0 },
 }};
 
-const be_ctypes_structure_t be_lv_draw_rect_dsc = {
-  51,  /* size in bytes */
-  29,  /* number of elements */
+const be_ctypes_structure_t be_lv_gradient_stop = {
+  3,  /* size in bytes */
+  2,  /* number of elements */
   be_ctypes_instance_mappings,
-  (const be_ctypes_structure_item_t[29]) {
+  (const be_ctypes_structure_item_t[2]) {
+    { "color", 0, 0, 0, ctypes_u16, 1 },
+    { "frac", 2, 0, 0, ctypes_u8, 0 },
+}};
+
+const be_ctypes_structure_t be_lv_grad_dsc = {
+  9,  /* size in bytes */
+  7,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[7]) {
+    { "dir", 8, 0, 3, ctypes_bf, 0 },
+    { "dither", 8, 3, 3, ctypes_bf, 0 },
+    { "stops_0_color", 0, 0, 0, ctypes_u16, 1 },
+    { "stops_0_frac", 2, 0, 0, ctypes_u8, 0 },
+    { "stops_1_color", 4, 0, 0, ctypes_u16, 1 },
+    { "stops_1_frac", 6, 0, 0, ctypes_u8, 0 },
+    { "stops_count", 7, 0, 0, ctypes_u8, 0 },
+}};
+
+const be_ctypes_structure_t be_lv_draw_rect_dsc = {
+  59,  /* size in bytes */
+  32,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[32]) {
     { "bg_color", 4, 0, 0, ctypes_u16, 1 },
-    { "bg_grad_color", 6, 0, 0, ctypes_u16, 1 },
-    { "bg_grad_color_stop", 9, 0, 0, ctypes_u8, 0 },
-    { "bg_grad_dir", 11, 0, 3, ctypes_bf, 0 },
-    { "bg_img_opa", 22, 0, 0, ctypes_u8, 0 },
-    { "bg_img_recolor", 20, 0, 0, ctypes_u16, 1 },
-    { "bg_img_recolor_opa", 23, 0, 0, ctypes_u8, 0 },
-    { "bg_img_src", 12, 0, 0, ctypes_ptr32, 0 },
-    { "bg_img_symbol_font", 16, 0, 0, ctypes_ptr32, 0 },
-    { "bg_img_tiled", 24, 0, 0, ctypes_u8, 0 },
-    { "bg_main_color_stop", 8, 0, 0, ctypes_u8, 0 },
-    { "bg_opa", 10, 0, 0, ctypes_u8, 0 },
+    { "bg_grad_dir", 16, 0, 3, ctypes_bf, 0 },
+    { "bg_grad_dither", 16, 3, 3, ctypes_bf, 0 },
+    { "bg_grad_stops_0_color", 8, 0, 0, ctypes_u16, 1 },
+    { "bg_grad_stops_0_frac", 10, 0, 0, ctypes_u8, 0 },
+    { "bg_grad_stops_1_color", 12, 0, 0, ctypes_u16, 1 },
+    { "bg_grad_stops_1_frac", 14, 0, 0, ctypes_u8, 0 },
+    { "bg_grad_stops_count", 15, 0, 0, ctypes_u8, 0 },
+    { "bg_img_opa", 30, 0, 0, ctypes_u8, 0 },
+    { "bg_img_recolor", 28, 0, 0, ctypes_u16, 1 },
+    { "bg_img_recolor_opa", 31, 0, 0, ctypes_u8, 0 },
+    { "bg_img_src", 20, 0, 0, ctypes_ptr32, 0 },
+    { "bg_img_symbol_font", 24, 0, 0, ctypes_ptr32, 0 },
+    { "bg_img_tiled", 32, 0, 0, ctypes_u8, 0 },
+    { "bg_opa", 3, 0, 0, ctypes_u8, 0 },
     { "blend_mode", 2, 0, 0, ctypes_u8, 0 },
-    { "border_color", 26, 0, 0, ctypes_u16, 1 },
-    { "border_opa", 30, 0, 0, ctypes_u8, 0 },
-    { "border_post", 31, 0, 1, ctypes_bf, 0 },
-    { "border_side", 31, 1, 5, ctypes_bf, 0 },
-    { "border_width", 28, 0, 0, ctypes_i16, 0 },
-    { "outline_color", 32, 0, 0, ctypes_u16, 1 },
-    { "outline_opa", 38, 0, 0, ctypes_u8, 0 },
-    { "outline_pad", 36, 0, 0, ctypes_i16, 0 },
-    { "outline_width", 34, 0, 0, ctypes_i16, 0 },
+    { "border_color", 34, 0, 0, ctypes_u16, 1 },
+    { "border_opa", 38, 0, 0, ctypes_u8, 0 },
+    { "border_post", 39, 0, 1, ctypes_bf, 0 },
+    { "border_side", 39, 1, 5, ctypes_bf, 0 },
+    { "border_width", 36, 0, 0, ctypes_i16, 0 },
+    { "outline_color", 40, 0, 0, ctypes_u16, 1 },
+    { "outline_opa", 46, 0, 0, ctypes_u8, 0 },
+    { "outline_pad", 44, 0, 0, ctypes_i16, 0 },
+    { "outline_width", 42, 0, 0, ctypes_i16, 0 },
     { "radius", 0, 0, 0, ctypes_i16, 0 },
-    { "shadow_color", 40, 0, 0, ctypes_u16, 1 },
-    { "shadow_ofs_x", 44, 0, 0, ctypes_i16, 0 },
-    { "shadow_ofs_y", 46, 0, 0, ctypes_i16, 0 },
-    { "shadow_opa", 50, 0, 0, ctypes_u8, 0 },
-    { "shadow_spread", 48, 0, 0, ctypes_i16, 0 },
-    { "shadow_width", 42, 0, 0, ctypes_i16, 0 },
+    { "shadow_color", 48, 0, 0, ctypes_u16, 1 },
+    { "shadow_ofs_x", 52, 0, 0, ctypes_i16, 0 },
+    { "shadow_ofs_y", 54, 0, 0, ctypes_i16, 0 },
+    { "shadow_opa", 58, 0, 0, ctypes_u8, 0 },
+    { "shadow_spread", 56, 0, 0, ctypes_i16, 0 },
+    { "shadow_width", 50, 0, 0, ctypes_i16, 0 },
 }};
 
 const be_ctypes_structure_t be_lv_draw_line_dsc = {
@@ -84,6 +110,21 @@ const be_ctypes_structure_t be_lv_draw_line_dsc = {
     { "width", 2, 0, 0, ctypes_i16, 0 },
 }};
 
+const be_ctypes_structure_t be_lv_draw_arc_dsc = {
+  14,  /* size in bytes */
+  8,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[8]) {
+    { "blend_mode", 13, 0, 2, ctypes_bf, 0 },
+    { "color", 0, 0, 0, ctypes_u16, 1 },
+    { "end_angle", 6, 0, 0, ctypes_u16, 0 },
+    { "img_src", 8, 0, 0, ctypes_ptr32, 0 },
+    { "opa", 12, 0, 0, ctypes_u8, 0 },
+    { "rounded", 13, 2, 1, ctypes_bf, 0 },
+    { "start_angle", 4, 0, 0, ctypes_u16, 0 },
+    { "width", 2, 0, 0, ctypes_i16, 0 },
+}};
+
 const be_ctypes_structure_t be_lv_draw_img_dsc = {
   21,  /* size in bytes */
   10,  /* number of elements */
@@ -212,31 +253,40 @@ const be_ctypes_structure_t be_lv_draw_mask_radius_param_cfg = {
     { "rect_y2", 6, 0, 0, ctypes_i16, 0 },
 }};
 
-const be_ctypes_structure_t be_lv_sqrt_res = {
-  4,  /* size in bytes */
-  2,  /* number of elements */
+const be_ctypes_structure_t be_lv_draw_mask_radius_circle_dsc = {
+  26,  /* size in bytes */
+  7,  /* number of elements */
   be_ctypes_instance_mappings,
-  (const be_ctypes_structure_item_t[2]) {
-    { "f", 2, 0, 0, ctypes_u16, 0 },
-    { "i", 0, 0, 0, ctypes_u16, 0 },
+  (const be_ctypes_structure_item_t[7]) {
+    { "buf", 0, 0, 0, ctypes_ptr32, 0 },
+    { "cir_opa", 4, 0, 0, ctypes_ptr32, 0 },
+    { "life", 16, 0, 0, ctypes_i32, 0 },
+    { "opa_start_on_y", 12, 0, 0, ctypes_ptr32, 0 },
+    { "radius", 24, 0, 0, ctypes_i16, 0 },
+    { "used_cnt", 20, 0, 0, ctypes_u32, 0 },
+    { "x_start_on_y", 8, 0, 0, ctypes_ptr32, 0 },
 }};
 
 const be_ctypes_structure_t be_lv_draw_mask_radius_param = {
-  28,  /* size in bytes */
-  11,  /* number of elements */
+  46,  /* size in bytes */
+  15,  /* number of elements */
   be_ctypes_instance_mappings,
-  (const be_ctypes_structure_item_t[11]) {
+  (const be_ctypes_structure_item_t[15]) {
     { "cfg_outer", 18, 0, 1, ctypes_bf, 0 },
     { "cfg_radius", 16, 0, 0, ctypes_i16, 0 },
     { "cfg_rect_x1", 8, 0, 0, ctypes_i16, 0 },
     { "cfg_rect_x2", 12, 0, 0, ctypes_i16, 0 },
     { "cfg_rect_y1", 10, 0, 0, ctypes_i16, 0 },
     { "cfg_rect_y2", 14, 0, 0, ctypes_i16, 0 },
+    { "circle_buf", 20, 0, 0, ctypes_ptr32, 0 },
+    { "circle_cir_opa", 24, 0, 0, ctypes_ptr32, 0 },
+    { "circle_life", 36, 0, 0, ctypes_i32, 0 },
+    { "circle_opa_start_on_y", 32, 0, 0, ctypes_ptr32, 0 },
+    { "circle_radius", 44, 0, 0, ctypes_i16, 0 },
+    { "circle_used_cnt", 40, 0, 0, ctypes_u32, 0 },
+    { "circle_x_start_on_y", 28, 0, 0, ctypes_ptr32, 0 },
     { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 },
     { "dsc_type", 4, 0, 0, ctypes_u8, 0 },
-    { "y_prev", 20, 0, 0, ctypes_i32, 0 },
-    { "y_prev_x_f", 26, 0, 0, ctypes_u16, 0 },
-    { "y_prev_x_i", 24, 0, 0, ctypes_u16, 0 },
 }};
 
 const be_ctypes_structure_t be_lv_draw_mask_fade_param_cfg = {
@@ -297,6 +347,26 @@ const be_ctypes_structure_t be_lv_draw_mask_map_param = {
     { "dsc_type", 4, 0, 0, ctypes_u8, 0 },
 }};
 
+const be_ctypes_structure_t be_lv_draw_mask_polygon_param_cfg = {
+  6,  /* size in bytes */
+  2,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[2]) {
+    { "point_cnt", 4, 0, 0, ctypes_u16, 0 },
+    { "points", 0, 0, 0, ctypes_ptr32, 0 },
+}};
+
+const be_ctypes_structure_t be_lv_draw_mask_polygon_param = {
+  14,  /* size in bytes */
+  4,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[4]) {
+    { "cfg_point_cnt", 12, 0, 0, ctypes_u16, 0 },
+    { "cfg_points", 8, 0, 0, ctypes_ptr32, 0 },
+    { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 },
+    { "dsc_type", 4, 0, 0, ctypes_u8, 0 },
+}};
+
 const be_ctypes_structure_t be_lv_draw_mask_saved = {
   8,  /* size in bytes */
   2,  /* number of elements */
@@ -329,10 +399,13 @@ const be_ctypes_structure_t be_lv_meter_scale = {
 }};
 
 const be_ctypes_structure_t be_lv_meter_indicator = {
-  16,  /* size in bytes */
-  5,  /* number of elements */
+  28,  /* size in bytes */
+  8,  /* number of elements */
   be_ctypes_instance_mappings,
-  (const be_ctypes_structure_item_t[5]) {
+  (const be_ctypes_structure_item_t[8]) {
+    { "data0", 16, 0, 0, ctypes_ptr32, 0 },
+    { "data1", 20, 0, 0, ctypes_ptr32, 0 },
+    { "data2", 24, 0, 0, ctypes_ptr32, 0 },
     { "end_value", 12, 0, 0, ctypes_i32, 0 },
     { "opa", 5, 0, 0, ctypes_u8, 0 },
     { "scale", 0, 0, 0, ctypes_ptr32, 0 },
@@ -432,6 +505,19 @@ const be_ctypes_structure_t be_lv_chart_cursor = {
     { "ser", 8, 0, 0, ctypes_ptr32, 0 },
 }};
 
+const be_ctypes_structure_t be_lv_chart_tick_dsc = {
+  10,  /* size in bytes */
+  6,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[6]) {
+    { "draw_size", 4, 0, 0, ctypes_i16, 0 },
+    { "label_en", 9, 6, 1, ctypes_bf, 0 },
+    { "major_cnt", 7, 7, 15, ctypes_bf, 0 },
+    { "major_len", 0, 0, 0, ctypes_i16, 0 },
+    { "minor_cnt", 6, 0, 15, ctypes_bf, 0 },
+    { "minor_len", 2, 0, 0, ctypes_i16, 0 },
+}};
+
 const be_ctypes_structure_t be_lv_obj_class = {
   27,  /* size in bytes */
   10,  /* number of elements */
@@ -451,14 +537,16 @@ const be_ctypes_structure_t be_lv_obj_class = {
 
 const be_ctypes_structure_t be_lv_event = {
   25,  /* size in bytes */
-  7,  /* number of elements */
+  9,  /* number of elements */
   be_ctypes_instance_mappings,
-  (const be_ctypes_structure_item_t[7]) {
+  (const be_ctypes_structure_item_t[9]) {
     { "code", 8, 0, 0, ctypes_i32, 0 },
     { "current_target", 4, 0, 0, ctypes_ptr32, 0 },
     { "deleted", 24, 0, 1, ctypes_bf, 0 },
     { "param", 16, 0, 0, ctypes_ptr32, 0 },
     { "prev", 20, 0, 0, ctypes_ptr32, 0 },
+    { "stop_bubbling", 24, 2, 1, ctypes_bf, 0 },
+    { "stop_processing", 24, 1, 1, ctypes_bf, 0 },
     { "target", 0, 0, 0, ctypes_ptr32, 0 },
     { "user_data", 12, 0, 0, ctypes_ptr32, 0 },
 }};
@@ -524,6 +612,32 @@ const be_ctypes_structure_t be_lv_timer = {
     { "user_data", 12, 0, 0, ctypes_ptr32, 0 },
 }};
 
+const be_ctypes_structure_t be_lv_draw_ctx = {
+  60,  /* size in bytes */
+  19,  /* number of elements */
+  be_ctypes_instance_mappings,
+  (const be_ctypes_structure_item_t[19]) {
+    { "buf", 0, 0, 0, ctypes_ptr32, 0 },
+    { "buf_area_x1", 4, 0, 0, ctypes_i16, 0 },
+    { "buf_area_x2", 8, 0, 0, ctypes_i16, 0 },
+    { "buf_area_y1", 6, 0, 0, ctypes_i16, 0 },
+    { "buf_area_y2", 10, 0, 0, ctypes_i16, 0 },
+    { "clip_area_x1", 12, 0, 0, ctypes_i16, 0 },
+    { "clip_area_x2", 16, 0, 0, ctypes_i16, 0 },
+    { "clip_area_y1", 14, 0, 0, ctypes_i16, 0 },
+    { "clip_area_y2", 18, 0, 0, ctypes_i16, 0 },
+    { "draw_arc", 24, 0, 0, ctypes_ptr32, 0 },
+    { "draw_bg", 48, 0, 0, ctypes_ptr32, 0 },
+    { "draw_img", 32, 0, 0, ctypes_ptr32, 0 },
+    { "draw_img_decoded", 28, 0, 0, ctypes_ptr32, 0 },
+    { "draw_letter", 36, 0, 0, ctypes_ptr32, 0 },
+    { "draw_line", 40, 0, 0, ctypes_ptr32, 0 },
+    { "draw_polygon", 44, 0, 0, ctypes_ptr32, 0 },
+    { "draw_rect", 20, 0, 0, ctypes_ptr32, 0 },
+    { "user_data", 56, 0, 0, ctypes_ptr32, 0 },
+    { "wait_for_finish", 52, 0, 0, ctypes_ptr32, 0 },
+}};
+
 const be_ctypes_structure_t be_lv_ts_calibration = {
   12,  /* size in bytes */
   5,  /* number of elements */
@@ -544,7 +658,10 @@ static const char * be_ctypes_instance_mappings[] = {
 static be_define_ctypes_class(lv_area, &be_lv_area, &be_class_ctypes, "lv_area");
 static be_define_ctypes_class(lv_chart_cursor, &be_lv_chart_cursor, &be_class_ctypes, "lv_chart_cursor");
 static be_define_ctypes_class(lv_chart_series, &be_lv_chart_series, &be_class_ctypes, "lv_chart_series");
+static be_define_ctypes_class(lv_chart_tick_dsc, &be_lv_chart_tick_dsc, &be_class_ctypes, "lv_chart_tick_dsc");
 static be_define_ctypes_class(lv_color_filter_dsc, &be_lv_color_filter_dsc, &be_class_ctypes, "lv_color_filter_dsc");
+static be_define_ctypes_class(lv_draw_arc_dsc, &be_lv_draw_arc_dsc, &be_class_ctypes, "lv_draw_arc_dsc");
+static be_define_ctypes_class(lv_draw_ctx, &be_lv_draw_ctx, &be_class_ctypes, "lv_draw_ctx");
 static be_define_ctypes_class(lv_draw_img_dsc, &be_lv_draw_img_dsc, &be_class_ctypes, "lv_draw_img_dsc");
 static be_define_ctypes_class(lv_draw_line_dsc, &be_lv_draw_line_dsc, &be_class_ctypes, "lv_draw_line_dsc");
 static be_define_ctypes_class(lv_draw_mask_angle_param, &be_lv_draw_mask_angle_param, &be_class_ctypes, "lv_draw_mask_angle_param");
@@ -556,11 +673,16 @@ static be_define_ctypes_class(lv_draw_mask_line_param, &be_lv_draw_mask_line_par
 static be_define_ctypes_class(lv_draw_mask_line_param_cfg, &be_lv_draw_mask_line_param_cfg, &be_class_ctypes, "lv_draw_mask_line_param_cfg");
 static be_define_ctypes_class(lv_draw_mask_map_param, &be_lv_draw_mask_map_param, &be_class_ctypes, "lv_draw_mask_map_param");
 static be_define_ctypes_class(lv_draw_mask_map_param_cfg, &be_lv_draw_mask_map_param_cfg, &be_class_ctypes, "lv_draw_mask_map_param_cfg");
+static be_define_ctypes_class(lv_draw_mask_polygon_param, &be_lv_draw_mask_polygon_param, &be_class_ctypes, "lv_draw_mask_polygon_param");
+static be_define_ctypes_class(lv_draw_mask_polygon_param_cfg, &be_lv_draw_mask_polygon_param_cfg, &be_class_ctypes, "lv_draw_mask_polygon_param_cfg");
+static be_define_ctypes_class(lv_draw_mask_radius_circle_dsc, &be_lv_draw_mask_radius_circle_dsc, &be_class_ctypes, "lv_draw_mask_radius_circle_dsc");
 static be_define_ctypes_class(lv_draw_mask_radius_param, &be_lv_draw_mask_radius_param, &be_class_ctypes, "lv_draw_mask_radius_param");
 static be_define_ctypes_class(lv_draw_mask_radius_param_cfg, &be_lv_draw_mask_radius_param_cfg, &be_class_ctypes, "lv_draw_mask_radius_param_cfg");
 static be_define_ctypes_class(lv_draw_mask_saved, &be_lv_draw_mask_saved, &be_class_ctypes, "lv_draw_mask_saved");
 static be_define_ctypes_class(lv_draw_rect_dsc, &be_lv_draw_rect_dsc, &be_class_ctypes, "lv_draw_rect_dsc");
 static be_define_ctypes_class(lv_event, &be_lv_event, &be_class_ctypes, "lv_event");
+static be_define_ctypes_class(lv_grad_dsc, &be_lv_grad_dsc, &be_class_ctypes, "lv_grad_dsc");
+static be_define_ctypes_class(lv_gradient_stop, &be_lv_gradient_stop, &be_class_ctypes, "lv_gradient_stop");
 static be_define_ctypes_class(lv_img_dsc, &be_lv_img_dsc, &be_class_ctypes, "lv_img_dsc");
 static be_define_ctypes_class(lv_img_header, &be_lv_img_header, &be_class_ctypes, "lv_img_header");
 static be_define_ctypes_class(lv_meter_indicator, &be_lv_meter_indicator, &be_class_ctypes, "lv_meter_indicator");
@@ -571,7 +693,6 @@ static be_define_ctypes_class(lv_meter_indicator_scale_lines, &be_lv_meter_indic
 static be_define_ctypes_class(lv_meter_scale, &be_lv_meter_scale, &be_class_ctypes, "lv_meter_scale");
 static be_define_ctypes_class(lv_obj_class, &be_lv_obj_class, &be_class_ctypes, "lv_obj_class");
 static be_define_ctypes_class(lv_point, &be_lv_point, &be_class_ctypes, "lv_point");
-static be_define_ctypes_class(lv_sqrt_res, &be_lv_sqrt_res, &be_class_ctypes, "lv_sqrt_res");
 static be_define_ctypes_class(lv_style_transition_dsc, &be_lv_style_transition_dsc, &be_class_ctypes, "lv_style_transition_dsc");
 static be_define_ctypes_class(lv_timer, &be_lv_timer, &be_class_ctypes, "lv_timer");
 static be_define_ctypes_class(lv_ts_calibration, &be_lv_ts_calibration, &be_class_ctypes, "lv_ts_calibration");
@@ -580,7 +701,10 @@ void be_load_ctypes_lvgl_definitions_lib(bvm *vm) {
   ctypes_register_class(vm, &be_class_lv_area, &be_lv_area);
   ctypes_register_class(vm, &be_class_lv_chart_cursor, &be_lv_chart_cursor);
   ctypes_register_class(vm, &be_class_lv_chart_series, &be_lv_chart_series);
+  ctypes_register_class(vm, &be_class_lv_chart_tick_dsc, &be_lv_chart_tick_dsc);
   ctypes_register_class(vm, &be_class_lv_color_filter_dsc, &be_lv_color_filter_dsc);
+  ctypes_register_class(vm, &be_class_lv_draw_arc_dsc, &be_lv_draw_arc_dsc);
+  ctypes_register_class(vm, &be_class_lv_draw_ctx, &be_lv_draw_ctx);
   ctypes_register_class(vm, &be_class_lv_draw_img_dsc, &be_lv_draw_img_dsc);
   ctypes_register_class(vm, &be_class_lv_draw_line_dsc, &be_lv_draw_line_dsc);
   ctypes_register_class(vm, &be_class_lv_draw_mask_angle_param, &be_lv_draw_mask_angle_param);
@@ -592,11 +716,16 @@ void be_load_ctypes_lvgl_definitions_lib(bvm *vm) {
   ctypes_register_class(vm, &be_class_lv_draw_mask_line_param_cfg, &be_lv_draw_mask_line_param_cfg);
   ctypes_register_class(vm, &be_class_lv_draw_mask_map_param, &be_lv_draw_mask_map_param);
   ctypes_register_class(vm, &be_class_lv_draw_mask_map_param_cfg, &be_lv_draw_mask_map_param_cfg);
+  ctypes_register_class(vm, &be_class_lv_draw_mask_polygon_param, &be_lv_draw_mask_polygon_param);
+  ctypes_register_class(vm, &be_class_lv_draw_mask_polygon_param_cfg, &be_lv_draw_mask_polygon_param_cfg);
+  ctypes_register_class(vm, &be_class_lv_draw_mask_radius_circle_dsc, &be_lv_draw_mask_radius_circle_dsc);
   ctypes_register_class(vm, &be_class_lv_draw_mask_radius_param, &be_lv_draw_mask_radius_param);
   ctypes_register_class(vm, &be_class_lv_draw_mask_radius_param_cfg, &be_lv_draw_mask_radius_param_cfg);
   ctypes_register_class(vm, &be_class_lv_draw_mask_saved, &be_lv_draw_mask_saved);
   ctypes_register_class(vm, &be_class_lv_draw_rect_dsc, &be_lv_draw_rect_dsc);
   ctypes_register_class(vm, &be_class_lv_event, &be_lv_event);
+  ctypes_register_class(vm, &be_class_lv_grad_dsc, &be_lv_grad_dsc);
+  ctypes_register_class(vm, &be_class_lv_gradient_stop, &be_lv_gradient_stop);
   ctypes_register_class(vm, &be_class_lv_img_dsc, &be_lv_img_dsc);
   ctypes_register_class(vm, &be_class_lv_img_header, &be_lv_img_header);
   ctypes_register_class(vm, &be_class_lv_meter_indicator, &be_lv_meter_indicator);
@@ -607,7 +736,6 @@ void be_load_ctypes_lvgl_definitions_lib(bvm *vm) {
   ctypes_register_class(vm, &be_class_lv_meter_scale, &be_lv_meter_scale);
   ctypes_register_class(vm, &be_class_lv_obj_class, &be_lv_obj_class);
   ctypes_register_class(vm, &be_class_lv_point, &be_lv_point);
-  ctypes_register_class(vm, &be_class_lv_sqrt_res, &be_lv_sqrt_res);
   ctypes_register_class(vm, &be_class_lv_style_transition_dsc, &be_lv_style_transition_dsc);
   ctypes_register_class(vm, &be_class_lv_timer, &be_lv_timer);
   ctypes_register_class(vm, &be_class_lv_ts_calibration, &be_lv_ts_calibration);
@@ -617,7 +745,10 @@ be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = {
   { "lv_area", &be_class_lv_area },
   { "lv_chart_cursor", &be_class_lv_chart_cursor },
   { "lv_chart_series", &be_class_lv_chart_series },
+  { "lv_chart_tick_dsc", &be_class_lv_chart_tick_dsc },
   { "lv_color_filter_dsc", &be_class_lv_color_filter_dsc },
+  { "lv_draw_arc_dsc", &be_class_lv_draw_arc_dsc },
+  { "lv_draw_ctx", &be_class_lv_draw_ctx },
   { "lv_draw_img_dsc", &be_class_lv_draw_img_dsc },
   { "lv_draw_line_dsc", &be_class_lv_draw_line_dsc },
   { "lv_draw_mask_angle_param", &be_class_lv_draw_mask_angle_param },
@@ -629,11 +760,16 @@ be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = {
   { "lv_draw_mask_line_param_cfg", &be_class_lv_draw_mask_line_param_cfg },
   { "lv_draw_mask_map_param", &be_class_lv_draw_mask_map_param },
   { "lv_draw_mask_map_param_cfg", &be_class_lv_draw_mask_map_param_cfg },
+  { "lv_draw_mask_polygon_param", &be_class_lv_draw_mask_polygon_param },
+  { "lv_draw_mask_polygon_param_cfg", &be_class_lv_draw_mask_polygon_param_cfg },
+  { "lv_draw_mask_radius_circle_dsc", &be_class_lv_draw_mask_radius_circle_dsc },
   { "lv_draw_mask_radius_param", &be_class_lv_draw_mask_radius_param },
   { "lv_draw_mask_radius_param_cfg", &be_class_lv_draw_mask_radius_param_cfg },
   { "lv_draw_mask_saved", &be_class_lv_draw_mask_saved },
   { "lv_draw_rect_dsc", &be_class_lv_draw_rect_dsc },
   { "lv_event", &be_class_lv_event },
+  { "lv_grad_dsc", &be_class_lv_grad_dsc },
+  { "lv_gradient_stop", &be_class_lv_gradient_stop },
   { "lv_img_dsc", &be_class_lv_img_dsc },
   { "lv_img_header", &be_class_lv_img_header },
   { "lv_meter_indicator", &be_class_lv_meter_indicator },
@@ -644,7 +780,6 @@ be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = {
   { "lv_meter_scale", &be_class_lv_meter_scale },
   { "lv_obj_class", &be_class_lv_obj_class },
   { "lv_point", &be_class_lv_point },
-  { "lv_sqrt_res", &be_class_lv_sqrt_res },
   { "lv_style_transition_dsc", &be_class_lv_style_transition_dsc },
   { "lv_timer", &be_class_lv_timer },
   { "lv_ts_calibration", &be_class_lv_ts_calibration },
diff --git a/lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_ctypes.be b/lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_ctypes.be
index 1ff9c2c68..246ac1829 100644
--- a/lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_ctypes.be
+++ b/lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_ctypes.be
@@ -34,6 +34,7 @@ uint8_t_11 = ctypes.bf_11
 uint8_t = ctypes.u8
 int16_t = ctypes.i16
 uint16_t = ctypes.u16
+uint16_t_15 = ctypes.bf_15
 uint16_t_16 = ctypes.bf_16
 uint32_t = ctypes.u32
 int32_t = ctypes.i32
@@ -53,17 +54,31 @@ lv_area = [            # valid LVGL8
 ]
 lv_area = ctypes.structure(lv_area, "lv_area")
 
-lv_draw_rect_dsc = [            # valid LVGL8
+#######################################################################
+# lv_grad_dsc
+lv_gradient_stop = [
+    [lv_color, "color"],
+    [uint8_t, "frac"],
+]
+lv_gradient_stop = ctypes.structure(lv_gradient_stop, "lv_gradient_stop")
+
+lv_grad_dsc = [
+    [lv_gradient_stop, "stops_0"],
+    [lv_gradient_stop, "stops_1"],
+    [uint8_t, "stops_count"],
+    [uint8_t_3, "dir"],
+    [uint8_t_3, "dither"],
+]
+lv_grad_dsc = ctypes.structure(lv_grad_dsc, "lv_grad_dsc")
+
+lv_draw_rect_dsc = [            # valid LVGL8.2
     [lv_coord, "radius"],
     [lv_blend_mode, "blend_mode"],
 
     #/*Background*/
-    [lv_color, "bg_color"],
-    [lv_color, "bg_grad_color"],
-    [uint8_t, "bg_main_color_stop"],
-    [uint8_t, "bg_grad_color_stop"],
     [lv_opa, "bg_opa"],
-    [uint8_t_3, "bg_grad_dir"],
+    [lv_color, "bg_color"],
+    [lv_grad_dsc, "bg_grad"],
 
     #/*Background img*/
     [ptr, "bg_img_src"],
@@ -96,7 +111,7 @@ lv_draw_rect_dsc = [            # valid LVGL8
 ]
 lv_draw_rect_dsc = ctypes.structure(lv_draw_rect_dsc, "lv_draw_rect_dsc")
 
-lv_draw_line_dsc = [            # valid LVGL8
+lv_draw_line_dsc = [            # valid LVGL8.2
     [lv_color, "color"],
     [lv_coord, "width"],
     [lv_coord, "dash_width"],
@@ -109,7 +124,19 @@ lv_draw_line_dsc = [            # valid LVGL8
 ]
 lv_draw_line_dsc = ctypes.structure(lv_draw_line_dsc, "lv_draw_line_dsc")
 
-lv_draw_img_dsc = [            # valid LVGL8
+lv_draw_arc_dsc = [            # valid LVGL8.2
+    [lv_color, "color"],
+    [lv_coord, "width"],
+    [uint16_t, "start_angle"],
+    [uint16_t, "end_angle"],
+    [ptr, "img_src"],
+    [lv_opa, "opa"],
+    [uint8_t_2, "blend_mode"],
+    [uint8_t_1, "rounded"],
+]
+lv_draw_arc_dsc = ctypes.structure(lv_draw_arc_dsc, "lv_draw_arc_dsc")
+
+lv_draw_img_dsc = [            # valid LVGL8.2
     [uint16_t, "angle"],
     [uint16_t, "zoom"],
     [lv_point, "pivot"],
@@ -130,13 +157,13 @@ lv_draw_mask_xcb = ptr    # callback
 lv_draw_mask_type = ctypes.u8
 lv_draw_mask_line_side = ctypes.u8
 
-lv_draw_mask_common_dsc = [            # valid LVGL8
+lv_draw_mask_common_dsc = [            # valid LVGL8.2
     [lv_draw_mask_xcb, "cb"],
     [lv_draw_mask_type, "type"],
 ]
 lv_draw_mask_common_dsc = ctypes.structure(lv_draw_mask_common_dsc, "lv_draw_mask_common_dsc")
 
-lv_draw_mask_line_param_cfg = [            # valid LVGL8
+lv_draw_mask_line_param_cfg = [            # valid LVGL8.2
     #/*First point */
     [lv_point, "p1"],
 
@@ -148,7 +175,7 @@ lv_draw_mask_line_param_cfg = [            # valid LVGL8
 ]
 lv_draw_mask_line_param_cfg = ctypes.structure(lv_draw_mask_line_param_cfg, "lv_draw_mask_line_param_cfg")
 
-lv_draw_mask_line_param = [            # valid LVGL8
+lv_draw_mask_line_param = [            # valid LVGL8.2
     #/*The first element must be the common descriptor*/
     [lv_draw_mask_common_dsc, "dsc"],
     [lv_draw_mask_line_param_cfg, "cfg"],
@@ -170,14 +197,14 @@ lv_draw_mask_line_param = [            # valid LVGL8
 ]
 lv_draw_mask_line_param = ctypes.structure(lv_draw_mask_line_param, "lv_draw_mask_line_param")
 
-lv_draw_mask_angle_param_cfg = [            # valid LVGL8
+lv_draw_mask_angle_param_cfg = [            # valid LVGL8.2
     [lv_point, "vertex_p"],
     [lv_coord, "start_angle"],
     [lv_coord, "end_angle"],
 ]
 lv_draw_mask_angle_param_cfg = ctypes.structure(lv_draw_mask_angle_param_cfg, "lv_draw_mask_angle_param_cfg")
 
-lv_draw_mask_angle_param = [            # valid LVGL8
+lv_draw_mask_angle_param = [            # valid LVGL8.2
     #/*The first element must be the common descriptor*/
     [lv_draw_mask_common_dsc, "dsc"],
     [lv_draw_mask_angle_param_cfg, "cfg"],
@@ -189,30 +216,34 @@ lv_draw_mask_angle_param = [            # valid LVGL8
 lv_draw_mask_angle_param = ctypes.structure(lv_draw_mask_angle_param, "lv_draw_mask_angle_param")
 
 
-lv_draw_mask_radius_param_cfg = [            # valid LVGL8
+lv_draw_mask_radius_param_cfg = [            # valid LVGL8.2
     [lv_area, "rect"],
     [lv_coord, "radius"],
     [uint8_t_1, "outer"],
 ]
 lv_draw_mask_radius_param_cfg = ctypes.structure(lv_draw_mask_radius_param_cfg, "lv_draw_mask_radius_param_cfg")
 
-lv_sqrt_res = [            # valid LVGL8
-    [uint16_t, "i"],
-    [uint16_t, "f"],
+lv_draw_mask_radius_circle_dsc = [            # valid LVGL8.2
+    [ptr, "buf"],
+    [ptr, "cir_opa"],
+    [ptr, "x_start_on_y"],
+    [ptr, "opa_start_on_y"],
+    [int32_t, "life"],
+    [uint32_t, "used_cnt"],
+    [lv_coord, "radius"],
 ]
-lv_sqrt_res = ctypes.structure(lv_sqrt_res, "lv_sqrt_res")
+lv_draw_mask_radius_circle_dsc = ctypes.structure(lv_draw_mask_radius_circle_dsc, "lv_draw_mask_radius_circle_dsc")
 
-lv_draw_mask_radius_param = [            # valid LVGL8
+lv_draw_mask_radius_param = [            # valid LVGL8.2
     #/*The first element must be the common descriptor*/
     [lv_draw_mask_common_dsc, "dsc"],
     [lv_draw_mask_radius_param_cfg, "cfg"],
-    [int32_t, "y_prev"],
-    [lv_sqrt_res, "y_prev_x"],
+    [lv_draw_mask_radius_circle_dsc, "circle"],
 ]
 lv_draw_mask_radius_param = ctypes.structure(lv_draw_mask_radius_param, "lv_draw_mask_radius_param")
 
 
-lv_draw_mask_fade_param_cfg = [            # valid LVGL8
+lv_draw_mask_fade_param_cfg = [            # valid LVGL8.2
     [lv_area, "coords"],
     [lv_coord, "y_top"],
     [lv_coord, "y_bottom"],
@@ -221,7 +252,7 @@ lv_draw_mask_fade_param_cfg = [            # valid LVGL8
 ]
 lv_draw_mask_fade_param_cfg = ctypes.structure(lv_draw_mask_fade_param_cfg, "lv_draw_mask_fade_param_cfg")
 
-lv_draw_mask_fade_param = [            # valid LVGL8
+lv_draw_mask_fade_param = [            # valid LVGL8.2
     # /*The first element must be the common descriptor*/
     [lv_draw_mask_common_dsc, "dsc"],
     [lv_draw_mask_fade_param_cfg, "cfg"],
@@ -229,20 +260,33 @@ lv_draw_mask_fade_param = [            # valid LVGL8
 lv_draw_mask_fade_param = ctypes.structure(lv_draw_mask_fade_param, "lv_draw_mask_fade_param")
 
 
-lv_draw_mask_map_param_cfg = [            # valid LVGL8
+lv_draw_mask_map_param_cfg = [            # valid LVGL8.2
     [lv_area, "coords"],
     [ptr, "map"],
 ]
 lv_draw_mask_map_param_cfg = ctypes.structure(lv_draw_mask_map_param_cfg, "lv_draw_mask_map_param_cfg")
 
-lv_draw_mask_map_param = [            # valid LVGL8
-    #/*The first element must be the common descriptor*/
+lv_draw_mask_map_param = [            # valid LVGL8.2
     [lv_draw_mask_common_dsc, "dsc"],
     [lv_draw_mask_map_param_cfg, "cfg"],
 ]
 lv_draw_mask_map_param = ctypes.structure(lv_draw_mask_map_param, "lv_draw_mask_map_param")
 
-lv_draw_mask_saved = [            # valid LVGL8
+
+lv_draw_mask_polygon_param_cfg = [            # valid LVGL8.2
+    [ptr, "points"],
+    [uint16_t, "point_cnt"],
+]
+lv_draw_mask_polygon_param_cfg = ctypes.structure(lv_draw_mask_polygon_param_cfg, "lv_draw_mask_polygon_param_cfg")
+
+lv_draw_mask_polygon_param = [            # valid LVGL8.2
+    [lv_draw_mask_common_dsc, "dsc"],
+    [lv_draw_mask_polygon_param_cfg, "cfg"],
+]
+lv_draw_mask_polygon_param = ctypes.structure(lv_draw_mask_polygon_param, "lv_draw_mask_polygon_param")
+
+
+lv_draw_mask_saved = [            # valid LVGL8.2
     [ptr, "param"],
     [ptr, "custom_id"],
 ]
@@ -251,7 +295,7 @@ lv_draw_mask_saved = ctypes.structure(lv_draw_mask_saved, "lv_draw_mask_saved")
 # lv_meter
 
 # lv_meter_scale_t
-lv_meter_scale = [            # valid LVGL8
+lv_meter_scale = [            # valid LVGL8.2
     [lv_color, "tick_color"],
     [uint16_t, "tick_cnt"],
     [uint16_t, "tick_length"],
@@ -274,17 +318,21 @@ lv_meter_scale = [            # valid LVGL8
 lv_meter_scale = ctypes.structure(lv_meter_scale, "lv_meter_scale")
 
 # lv_meter_indicator_t
-lv_meter_indicator = [            # valid LVGL8
+lv_meter_indicator = [            # valid LVGL8.2
     [ptr, "scale"],
     [lv_meter_indicator_type_t, "type"],
     [lv_opa, "opa"],
     [int32_t, "start_value"],
     [int32_t, "end_value"],
+    # more unions here that we can hardly manage simply
+    [ptr, "data0"],
+    [ptr, "data1"],
+    [ptr, "data2"],
 ]
 lv_meter_indicator = ctypes.structure(lv_meter_indicator, "lv_meter_indicator")
 
 # variants
-lv_meter_indicator_needle_img = [            # valid LVGL8
+lv_meter_indicator_needle_img = [            # valid LVGL8.2
     [ptr, "scale"],
     [lv_meter_indicator_type_t, "type"],
     [lv_opa, "opa"],
@@ -296,7 +344,7 @@ lv_meter_indicator_needle_img = [            # valid LVGL8
 ]
 lv_meter_indicator_needle_img = ctypes.structure(lv_meter_indicator_needle_img, "lv_meter_indicator_needle_img")
 
-lv_meter_indicator_needle_line = [            # valid LVGL8
+lv_meter_indicator_needle_line = [            # valid LVGL8.2
     [ptr, "scale"],
     [lv_meter_indicator_type_t, "type"],
     [lv_opa, "opa"],
@@ -309,7 +357,7 @@ lv_meter_indicator_needle_line = [            # valid LVGL8
 ]
 lv_meter_indicator_needle_line = ctypes.structure(lv_meter_indicator_needle_line, "lv_meter_indicator_needle_line")
 
-lv_meter_indicator_arc = [            # valid LVGL8
+lv_meter_indicator_arc = [            # valid LVGL8.2
     [ptr, "scale"],
     [lv_meter_indicator_type_t, "type"],
     [lv_opa, "opa"],
@@ -323,7 +371,7 @@ lv_meter_indicator_arc = [            # valid LVGL8
 ]
 lv_meter_indicator_arc = ctypes.structure(lv_meter_indicator_arc, "lv_meter_indicator_arc")
 
-lv_meter_indicator_scale_lines = [            # valid LVGL8
+lv_meter_indicator_scale_lines = [            # valid LVGL8.2
     [ptr, "scale"],
     [lv_meter_indicator_type_t, "type"],
     [lv_opa, "opa"],
@@ -337,7 +385,7 @@ lv_meter_indicator_scale_lines = [            # valid LVGL8
 ]
 lv_meter_indicator_scale_lines = ctypes.structure(lv_meter_indicator_scale_lines, "lv_meter_indicator_scale_lines")
 
-lv_chart_series = [
+lv_chart_series = [            # valid LVGL8.2
     [ptr, "x_points"],
     [ptr, "y_points"],
     [lv_color, "color"],
@@ -350,7 +398,7 @@ lv_chart_series = [
 ]
 lv_chart_series = ctypes.structure(lv_chart_series, "lv_chart_series")
 
-lv_chart_cursor = [
+lv_chart_cursor = [            # valid LVGL8.2
     [lv_point, "pos"],
     [uint16_t, "point_id"],
     [lv_color, "color"],
@@ -360,6 +408,17 @@ lv_chart_cursor = [
 ]
 lv_chart_cursor = ctypes.structure(lv_chart_cursor, "lv_chart_cursor")
 
+lv_chart_tick_dsc = [            # valid LVGL8.2
+    [lv_coord, "major_len"],
+    [lv_coord, "minor_len"],
+    [lv_coord, "draw_size"],
+    [uint16_t_15, "minor_cnt"],
+    [uint16_t_15, "major_cnt"],
+    [uint8_t_1, "label_en"],
+]
+lv_chart_tick_dsc = ctypes.structure(lv_chart_tick_dsc, "lv_chart_tick_dsc")
+
+
 #- --------- class system --------- -#
 lv_obj_class_ptr = ptr
 lv_obj_ptr = ptr
@@ -369,7 +428,7 @@ destructor_cb = ptr    # callback
 event_cb = ptr    # callback
 lv_event_code = ctypes.i32
 
-lv_obj_class = [            # valid LVGL8
+lv_obj_class = [            # valid LVGL8.2
     [lv_obj_class_ptr, "base_class"],
     [constructor_cb, "constructor_cb"],
     [destructor_cb, "destructor_cb"],
@@ -383,7 +442,7 @@ lv_obj_class = [            # valid LVGL8
 ]
 lv_obj_class = ctypes.structure(lv_obj_class, "lv_obj_class")
 
-lv_event = [            # valid LVGL8
+lv_event = [            # valid LVGL8.2
     [lv_obj_ptr, "target"],
     [lv_obj_ptr, "current_target"],
     [lv_event_code, "code"],
@@ -391,12 +450,14 @@ lv_event = [            # valid LVGL8
     [ptr, "param"],
     [lv_event_ptr, "prev"],
     [uint8_t_1, "deleted"],
+    [uint8_t_1, "stop_processing"],
+    [uint8_t_1, "stop_bubbling"],
 ]
 lv_event = ctypes.structure(lv_event, "lv_event")
 
 #######################################################################
 # lv_img structures
-lv_img_header = [            # valid LVGL8
+lv_img_header = [            # valid LVGL8.2
     [uint8_t_5, "cf"],
     [uint8_t_3, "always_zero"],
     [uint8_t_2, "reserved"],
@@ -405,9 +466,8 @@ lv_img_header = [            # valid LVGL8
 ]
 lv_img_header = ctypes.structure(lv_img_header, "lv_img_header")
 
-lv_img_dsc = [            # valid LVGL8
+lv_img_dsc = [            # valid LVGL8.2
     [lv_img_header, "header"],
-    [uint8_t_5, "cf"],
     [uint32_t, "data_size"],
     [ptr, "data"],
 ]
@@ -415,7 +475,7 @@ lv_img_dsc = ctypes.structure(lv_img_dsc, "lv_img_dsc")
 
 #######################################################################
 # lv_style
-lv_style_transition_dsc = [            # valid LVGL8
+lv_style_transition_dsc = [            # valid LVGL8.2
     [ptr, "props"],
     [ptr, "user_data"],
     [ptr, "path_xcb"],
@@ -433,7 +493,7 @@ lv_style_transition_dsc = ctypes.structure(lv_style_transition_dsc, "lv_style_tr
 # ]
 # lv_color_hsv = ctypes.structure(lv_color_hsv, "lv_color_hsv")
 
-lv_color_filter_dsc = [            # valid LVGL8
+lv_color_filter_dsc = [            # valid LVGL8.2
     [ptr, "filter_cb"],
     [ptr, "user_data"],
 ]
@@ -441,7 +501,7 @@ lv_color_filter_dsc = ctypes.structure(lv_color_filter_dsc, "lv_color_filter_dsc
 
 #######################################################################
 # lv_timer
-lv_timer = [            # valid LVGL8
+lv_timer = [            # valid LVGL8.2
     [uint32_t, "period"],
     [uint32_t, "last_run"],
     [ptr, "timer_cb"],
@@ -451,6 +511,25 @@ lv_timer = [            # valid LVGL8
 ]
 lv_timer = ctypes.structure(lv_timer, "lv_timer")
 
+#######################################################################
+# lv_draw_ctc
+lv_draw_ctx = [            # valid LVGL8.2
+    [ptr, "buf"],
+    [lv_area, "buf_area"],
+    [lv_area, "clip_area"],
+    [ptr, "draw_rect"],
+    [ptr, "draw_arc"],
+    [ptr, "draw_img_decoded"],
+    [ptr, "draw_img"],
+    [ptr, "draw_letter"],
+    [ptr, "draw_line"],
+    [ptr, "draw_polygon"],
+    [ptr, "draw_bg"],
+    [ptr, "wait_for_finish"],
+    [ptr, "user_data"],
+]
+lv_draw_ctx = ctypes.structure(lv_draw_ctx, "lv_draw_ctx")
+
 #######################################################################
 # Special structure used to calibrate resistive touchscreens
 #######################################################################
diff --git a/lib/libesp32_lvgl/lv_berry/tools/convert.py b/lib/libesp32_lvgl/lv_berry/tools/convert.py
index 5cd26a2b9..2f8ff5725 100644
--- a/lib/libesp32_lvgl/lv_berry/tools/convert.py
+++ b/lib/libesp32_lvgl/lv_berry/tools/convert.py
@@ -102,6 +102,7 @@ return_types = {
   "lv_img_size_mode_t": "i",
   "lv_palette_t": "i",
   "lv_style_prop_t": "i",
+  "lv_dither_mode_t": "i",
   # layouts
   "lv_flex_align_t": "i",
   "lv_flex_flow_t": "i",
@@ -140,6 +141,9 @@ return_types = {
   "lv_img_dsc_t *": "lv_img_dsc",
   "lv_ts_calibration_t *": "lv_ts_calibration",
   "lv_style_transition_dsc_t *": "lv_style_transition_dsc",
+  "lv_draw_ctx_t *": "lv_draw_ctx",
+  "_lv_draw_ctx_t *": "lv_draw_ctx",
+  "lv_grad_dsc_t *": "lv_grad_dsc",
   # "lv_color_hsv_t *": "lv_color_hsv",
   "lv_color_filter_dsc_t *": "lv_color_filter_dsc",
   "lv_timer_t *": "lv_timer",
diff --git a/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py b/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py
index 7f6bafe75..529375edf 100644
--- a/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py
+++ b/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py
@@ -64,6 +64,7 @@ lv_fun_globs = [
                   "extra/themes/default/*.h",
                   "extra/themes/mono/*.h",
                   "extra/layouts/**/*.h",
+                  "extra/libs/qrcode/lv_qrcode.h",
                   "core/*.h",
                   "draw/*.h",
                   "misc/lv_style_gen.h",
@@ -163,6 +164,8 @@ for header_name in headers_names:
               "^lv_indev_scroll_",
               "^lv_keyboard_def_event_cb",  # need to fix conditional include
               "^lv_event_get_",            # event_getters not needed
+              "^lv_refr_reset_fps_counter",
+              "^lv_refr_get_fps_avg",
             ]:
           if re.search(exclude_pattern, fun_name): exclude = True
         if exclude: continue
@@ -329,7 +332,8 @@ for header_name in headers_names:
         # item is ready
         exclude = False
         for exclude_prefix in ["_", "LV_BIDI_DIR_", "LV_FONT_", "LV_IMG_CF_RESERVED_", "LV_IMG_CF_USER_",
-                               "LV_SIGNAL_", "LV_TEMPL_", "LV_TASK_PRIO_", "LV_THEME_", "LV_KEYBOARD_"]:
+                               "LV_SIGNAL_", "LV_TEMPL_", "LV_TASK_PRIO_", "LV_THEME_", "LV_KEYBOARD_",
+                               "LV_LRU_"]:
           if enum_item.startswith(exclude_prefix): exclude = True
         if exclude: continue
 
diff --git a/lib/libesp32_lvgl/lvgl/Kconfig b/lib/libesp32_lvgl/lvgl/Kconfig
index f0e629532..8fe14ec1d 100644
--- a/lib/libesp32_lvgl/lvgl/Kconfig
+++ b/lib/libesp32_lvgl/lvgl/Kconfig
@@ -2,14 +2,6 @@
 
 menu "LVGL configuration"
 
-    config LV_ATTRIBUTE_FAST_MEM_USE_IRAM
-        bool "Set IRAM as LV_ATTRIBUTE_FAST_MEM"
-        help
-            Set this option to configure IRAM as LV_ATTRIBUTE_FAST_MEM
-
-    config LV_CONF_MINIMAL
-        bool "LVGL minimal configuration."
-
     # Define CONFIG_LV_CONF_SKIP so we can use LVGL
     # without lv_conf.h file, the lv_conf_internal.h and
     # lv_conf_kconfig.h files are used instead.
@@ -17,8 +9,11 @@ menu "LVGL configuration"
         bool
         default y
 
+    config LV_CONF_MINIMAL
+        bool "LVGL minimal configuration."
+
     menu "Color settings"
-        choice
+        choice LV_COLOR_DEPTH
             prompt "Color depth."
             default LV_COLOR_DEPTH_16
             help
@@ -42,7 +37,7 @@ menu "LVGL configuration"
             default 32 if LV_COLOR_DEPTH_32
 
         config LV_COLOR_16_SWAP
-            bool "Swap the 2 bytes of RGB565 color. Useful if the display has a 8 bit interface (e.g. SPI)."
+            bool "Swap the 2 bytes of RGB565 color. Useful if the display has an 8-bit interface (e.g. SPI)."
             depends on LV_COLOR_DEPTH_16
 
         config LV_COLOR_SCREEN_TRANSP
@@ -52,7 +47,19 @@ menu "LVGL configuration"
                 Can be used if the UI is above another layer, e.g. an OSD menu or video player.
                 Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to
                 non LV_OPA_COVER value
-    
+
+        config LV_COLOR_MIX_ROUND_OFS
+            int "Adjust color mix functions rounding"
+            default 128 if !LV_COLOR_DEPTH_32
+            default 0 if LV_COLOR_DEPTH_32
+            range 0 254
+            help
+                0: no adjustment, get the integer part of the result (round down)
+                64: round up from x.75
+                128: round up from half
+                192: round up from x.25
+                254: round up
+
         config LV_COLOR_CHROMA_KEY_HEX
             hex "Images pixels with this color will not be drawn (if they are chroma keyed)."
             range 0x000000 0xFFFFFF
@@ -71,11 +78,24 @@ menu "LVGL configuration"
             default 32
             depends on !LV_MEM_CUSTOM
 
+        config LV_MEM_ADDR
+            hex "Address for the memory pool instead of allocating it as a normal array"
+            default 0x0
+            depends on !LV_MEM_CUSTOM
+
         config LV_MEM_CUSTOM_INCLUDE
             string "Header to include for the custom memory function"
             default "stdlib.h"
             depends on LV_MEM_CUSTOM
 
+        config LV_MEM_BUF_MAX_NUM
+            int "Number of the memory buffer"
+            default 16
+            help
+                Number of the intermediate memory buffer used during rendering and other
+                internal processing mechanisms.  You will see an error log message if
+                there wasn't enough buffers.
+
         config LV_MEMCPY_MEMSET_STD
             bool "Use the standard memcpy and memset instead of LVGL's own functions"
     endmenu
@@ -92,12 +112,10 @@ menu "LVGL configuration"
             default 30
 
         config LV_TICK_CUSTOM
-            bool
-            prompt "Use a custom tick source"
+            bool "Use a custom tick source"
 
         config LV_TICK_CUSTOM_INCLUDE
-            string
-            prompt "Header for the system time function"
+            string "Header for the system time function"
             default "Arduino.h"
             depends on LV_TICK_CUSTOM
 
@@ -128,6 +146,16 @@ menu "LVGL configuration"
                     shadow size is `shadow_width + radius`.
                     Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost.
 
+            config LV_CIRCLE_CACHE_SIZE
+                int "Set number of maximally cached circle data"
+                depends on LV_DRAW_COMPLEX
+                default 4
+                help
+                    The circumference of 1/4 circle are saved for anti-aliasing
+                    radius * 4 bytes are used per circle (the most often used
+                    radiuses are saved).
+                    Set to 0 to disable caching.
+
             config LV_IMG_CACHE_DEF_SIZE
                 int "Default image cache size. 0 to disable caching."
                 default 0
@@ -139,14 +167,47 @@ menu "LVGL configuration"
                     save the continuous open/decode of images.
                     However the opened images might consume additional RAM.
 
+            config LV_GRADIENT_MAX_STOPS
+                int "Number of stops allowed per gradient."
+                default 2
+                help
+                    Increase this to allow more stops.
+                    This adds (sizeof(lv_color_t) + 1) bytes per additional stop
+
+            config LV_GRAD_CACHE_DEF_SIZE
+                int "Default gradient buffer size."
+                default 0
+                help
+                    When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again.
+                    LV_GRAD_CACHE_DEF_SIZE sets the size of this cache in bytes.
+                    If the cache is too small the map will be allocated only while it's required for the drawing.
+                    0 mean no caching.
+
+            config LV_DITHER_GRADIENT
+                bool "Allow dithering the gradients"
+                help
+                    Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display)
+                    LV_DITHER_GRADIENT implies allocating one or two more lines of the object's rendering surface
+                    The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion
+
+            config LV_DITHER_ERROR_DIFFUSION
+                bool "Add support for error diffusion dithering"
+                depends on LV_DITHER_GRADIENT
+                help
+                    Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing.
+                    The increase in memory consumption is (24 bits * object's width)
+
             config LV_DISP_ROT_MAX_BUF
                 int "Maximum buffer size to allocate for rotation"
                 default 10240
                 help
                     Only used if software rotation is enabled in the display driver.
         endmenu
-        
+
         menu "GPU"
+            config LV_USE_EXTERNAL_RENDERER
+                bool
+
             config LV_USE_GPU_STM32_DMA2D
                 bool "Enable STM32 DMA2D (aka Chrom Art) GPU."
             config LV_GPU_DMA2D_CMSIS_INCLUDE
@@ -171,8 +232,18 @@ menu "LVGL configuration"
                     selected.
                     0: lv_gpu_nxp_pxp_init() has to be called manually before
                     lv_init().
+
             config LV_USE_GPU_NXP_VG_LITE
                 bool "Use NXP's VG-Lite GPU iMX RTxxx platforms."
+
+            config LV_USE_GPU_SDL
+                bool "Use SDL renderer API"
+                select LV_USE_EXTERNAL_RENDERER
+                default n
+            config LV_GPU_SDL_INCLUDE_PATH
+                string "include path of SDL header"
+                depends on LV_USE_GPU_SDL
+                default "SDL2/SDL.h"
         endmenu
 
         menu "Logging"
@@ -272,14 +343,69 @@ menu "LVGL configuration"
 
             config LV_USE_ASSERT_OBJ
                 bool "Check NULL, the object's type and existence (e.g. not deleted). (Slow)."
+
+            config LV_ASSERT_HANDLER_INCLUDE
+                string "Header to include for the custom assert function"
+                default "assert.h"
         endmenu
 
         menu "Others"
             config LV_USE_PERF_MONITOR
-                bool "Show CPU usage and FPS count in the right bottom corner."
+                bool "Show CPU usage and FPS count."
+
+            choice
+                prompt "Performance monitor position."
+                depends on LV_USE_PERF_MONITOR
+                default LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT
+
+                config LV_PERF_MONITOR_ALIGN_TOP_LEFT
+                    bool "Top left"
+                config LV_PERF_MONITOR_ALIGN_TOP_MID
+                    bool "Top middle"
+                config LV_PERF_MONITOR_ALIGN_TOP_RIGHT
+                    bool "Top right"
+                config LV_PERF_MONITOR_ALIGN_BOTTOM_LEFT
+                    bool "Bottom left"
+                config LV_PERF_MONITOR_ALIGN_BOTTOM_MID
+                    bool "Bottom middle"
+                config LV_PERF_MONITOR_ALIGN_BOTTOM_RIGHT
+                    bool "Bottom right"
+                config LV_PERF_MONITOR_ALIGN_LEFT_MID
+                    bool "Left middle"
+                config LV_PERF_MONITOR_ALIGN_RIGHT_MID
+                    bool "Right middle"
+                config LV_PERF_MONITOR_ALIGN_BOTTOM_CENTER
+                    bool "Center"
+            endchoice
 
             config LV_USE_MEM_MONITOR
-                bool "Show the used memory and the memory fragmentation in the left bottom corner. Requires LV_MEM_CUSTOM = 0"
+                bool "Show the used memory and the memory fragmentation."
+                depends on !LV_MEM_CUSTOM
+
+            choice
+                prompt "Memory monitor position."
+                depends on LV_USE_MEM_MONITOR
+                default LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT
+
+                config LV_MEM_MONITOR_ALIGN_TOP_LEFT
+                    bool "Top left"
+                config LV_MEM_MONITOR_ALIGN_TOP_MID
+                    bool "Top middle"
+                config LV_MEM_MONITOR_ALIGN_TOP_RIGHT
+                    bool "Top right"
+                config LV_MEM_MONITOR_ALIGN_BOTTOM_LEFT
+                    bool "Bottom left"
+                config LV_MEM_MONITOR_ALIGN_BOTTOM_MID
+                    bool "Bottom middle"
+                config LV_MEM_MONITOR_ALIGN_BOTTOM_RIGHT
+                    bool "Bottom right"
+                config LV_MEM_MONITOR_ALIGN_LEFT_MID
+                    bool "Left middle"
+                config LV_MEM_MONITOR_ALIGN_RIGHT_MID
+                    bool "Right middle"
+                config LV_MEM_MONITOR_ALIGN_BOTTOM_CENTER
+                    bool "Center"
+            endchoice
 
             config LV_USE_REFR_DEBUG
                 bool "Draw random colored rectangles over the redrawn areas."
@@ -287,6 +413,11 @@ menu "LVGL configuration"
             config LV_SPRINTF_CUSTOM
                 bool "Change the built-in (v)snprintf functions"
 
+            config LV_SPRINTF_INCLUDE
+                string "Header to include for the custom sprintf function"
+                depends on LV_SPRINTF_CUSTOM
+                default "stdio.h"
+
             config LV_SPRINTF_USE_FLOAT
                 bool "Enable float in built-in (v)snprintf functions"
                 depends on !LV_SPRINTF_CUSTOM
@@ -294,33 +425,32 @@ menu "LVGL configuration"
             config LV_USE_USER_DATA
                 bool "Add a 'user_data' to drivers and objects."
                 default y
+
+            config LV_ENABLE_GC
+                bool "Enable garbage collector"
+
+            config LV_GC_INCLUDE
+                string "Header to include for the garbage collector related things"
+                depends on LV_ENABLE_GC
+                default "gc.h"
         endmenu
 
         menu "Compiler settings"
             config LV_BIG_ENDIAN_SYSTEM
                 bool "For big endian systems set to 1"
 
+            config LV_ATTRIBUTE_MEM_ALIGN_SIZE
+                int "Required alignment size for buffers"
+                default 1
+
+            config LV_ATTRIBUTE_FAST_MEM_USE_IRAM
+                bool "Set IRAM as LV_ATTRIBUTE_FAST_MEM"
+                help
+                    Set this option to configure IRAM as LV_ATTRIBUTE_FAST_MEM
+
             config LV_USE_LARGE_COORD
                 bool "Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t"
         endmenu
-
-        config LV_USE_USER_DATA_FREE
-            bool "Free the user data field upon object deletion"
-            depends on LV_USE_USER_DATA
-        config LV_USER_DATA_FREE_INCLUDE
-            string "Header for user data free function"
-            default "something.h"
-            depends on LV_USE_USER_DATA_FREE
-        config LV_USER_DATA_FREE
-            string "Invoking for user data free function. It has the lv_obj_t pointer as single parameter."
-            default "(user_data_free)"
-            depends on LV_USE_USER_DATA_FREE
-        config LV_USE_API_EXTENSION_V6
-            bool "Use the functions and types from the older (v6) API if possible."
-            default y if !LV_CONF_MINIMAL
-        config LV_USE_API_EXTENSION_V7
-            bool "Use the functions and types from the older (v7) API if possible."
-            default y if !LV_CONF_MINIMAL
     endmenu
 
     menu "Font usage"
@@ -369,46 +499,31 @@ menu "LVGL configuration"
             config LV_FONT_MONTSERRAT_48
                 bool "Enable Montserrat 48"
 
+            config LV_FONT_MONTSERRAT_12_SUBPX
+                bool "Enable Montserrat 12 sub-pixel"
+            config LV_FONT_MONTSERRAT_28_COMPRESSED
+                bool "Enable Montserrat 28 compressed"
+            config LV_FONT_DEJAVU_16_PERSIAN_HEBREW
+                bool "Enable Dejavu 16 Persian, Hebrew, Arabic letters"
+            config LV_FONT_SIMSUN_16_CJK
+                bool "Enable Simsun 16 CJK"
+
             config LV_FONT_UNSCII_8
                 bool "Enable UNSCII 8 (Perfect monospace font)"
                 default y if LV_CONF_MINIMAL
             config LV_FONT_UNSCII_16
                 bool "Enable UNSCII 16 (Perfect monospace font)"
 
-            config LV_FONT_MONTSERRAT12SUBPX
-                bool "Enable Montserrat 12 sub-pixel"
-            config LV_FONT_MONTSERRAT28COMPRESSED
-                bool "Enable Montserrat 28 compressed"
-            config LV_FONT_DEJAVU_16_PERSIAN_HEBREW
-                bool "Enable Dejavu 16 Persian, Hebrew, Arabic letters"
-            config LV_FONT_SIMSUN_16_CJK
-                bool "Enable Simsun 16 CJK"
+            config LV_FONT_CUSTOM
+                bool "Enable the custom font"
+            config LV_FONT_CUSTOM_DECLARE
+                string "Header to include for the custom font"
+                depends on LV_FONT_CUSTOM
         endmenu
 
-        config LV_FONT_FMT_TXT_LARGE
-            bool "Enable it if you have fonts with a lot of characters."
-            help
-                The limit depends on the font size, font face and bpp
-                but with > 10,000 characters if you see issues probably you
-                need to enable it.
-
-        config LV_USE_FONT_COMPRESSED
-            bool "Sets support for compressed fonts."
-
-        config LV_USE_FONT_SUBPX
-            bool "Enable subpixel rendering."
-
-        config LV_FONT_SUBPX_BGR
-            bool "Use BGR instead RGB for sub-pixel rendering."
-            depends on LV_USE_FONT_SUBPX
-            help
-                Set the pixel order of the display.
-                Important only if "subpx fonts" are used.
-                With "normal" font it doesn't matter.
-
         choice LV_FONT_DEFAULT
             prompt "Select theme default title font"
-            default LV_FONT_DEFAULT_MONTSERRAT_16 if !LV_CONF_MINIMAL
+            default LV_FONT_DEFAULT_MONTSERRAT_14 if !LV_CONF_MINIMAL
             default LV_FONT_DEFAULT_UNSCII_8 if LV_CONF_MINIMAL
             help
                 Select theme default title font
@@ -473,46 +588,46 @@ menu "LVGL configuration"
             config LV_FONT_DEFAULT_MONTSERRAT_48
                 bool "Montserrat 48"
                 select LV_FONT_MONTSERRAT_48
-            config LV_FONT_DEFAULT_UNSCII_8
-                bool "UNSCII 8 (Perfect monospace font)"
-                select LV_FONT_UNSCII_8
-            config LV_FONT_DEFAULT_UNSCII_16
-                bool "UNSCII 16 (Perfect monospace font)"
-                select LV_FONT_UNSCII_16
-            config LV_FONT_DEFAULT_MONTSERRAT12SUBPX
+            config LV_FONT_DEFAULT_MONTSERRAT_12_SUBPX
                 bool "Montserrat 12 sub-pixel"
-                select LV_FONT_MONTSERRAT12SUBPX
-            config LV_FONT_DEFAULT_MONTSERRAT28COMPRESSED
+                select LV_FONT_MONTSERRAT_12_SUBPX
+            config LV_FONT_DEFAULT_MONTSERRAT_28_COMPRESSED
                 bool "Montserrat 28 compressed"
-                select LV_FONT_MONTSERRAT28COMPRESSED
+                select LV_FONT_MONTSERRAT_28_COMPRESSED
             config LV_FONT_DEFAULT_DEJAVU_16_PERSIAN_HEBREW
                 bool "Dejavu 16 Persian, Hebrew, Arabic letters"
                 select LV_FONT_DEJAVU_16_PERSIAN_HEBREW
             config LV_FONT_DEFAULT_SIMSUN_16_CJK
                 bool "Simsun 16 CJK"
                 select LV_FONT_SIMSUN_16_CJK
+            config LV_FONT_DEFAULT_UNSCII_8
+                bool "UNSCII 8 (Perfect monospace font)"
+                select LV_FONT_UNSCII_8
+            config LV_FONT_DEFAULT_UNSCII_16
+                bool "UNSCII 16 (Perfect monospace font)"
+                select LV_FONT_UNSCII_16
         endchoice
-    endmenu
 
-    menu "Themes"
-        config LV_USE_THEME_DEFAULT
-            bool "A simple, impressive and very complete theme"
-            default y
-        config LV_THEME_DEFAULT_PALETTE_LIGHT
-            bool "Yes to set light mode, No to set dark mode"
-            default y
-            depends on LV_USE_THEME_DEFAULT
-        config LV_THEME_DEFAULT_GROW
-            bool "Enable grow on press"
-            default y
-            depends on LV_USE_THEME_DEFAULT
-        config LV_THEME_DEFAULT_TRANSITION_TIME
-            int "Default transition time in [ms]"
-            default 80
-            depends on LV_USE_THEME_DEFAULT
-        config LV_USE_THEME_BASIC
-            bool "A very simple theme that is a good starting point for a custom theme"
-            default y
+        config LV_FONT_FMT_TXT_LARGE
+            bool "Enable it if you have fonts with a lot of characters."
+            help
+                The limit depends on the font size, font face and bpp
+                but with > 10,000 characters if you see issues probably you
+                need to enable it.
+
+        config LV_USE_FONT_COMPRESSED
+            bool "Sets support for compressed fonts."
+
+        config LV_USE_FONT_SUBPX
+            bool "Enable subpixel rendering."
+
+        config LV_FONT_SUBPX_BGR
+            bool "Use BGR instead RGB for sub-pixel rendering."
+            depends on LV_USE_FONT_SUBPX
+            help
+                Set the pixel order of the display.
+                Important only if "subpx fonts" are used.
+                With "normal" font it doesn't matter.
     endmenu
 
     menu "Text Settings"
@@ -604,9 +719,6 @@ menu "LVGL configuration"
         config LV_USE_CHECKBOX
             bool "Check Box"
             default y if !LV_CONF_MINIMAL
-        config LV_USE_CHART
-            bool "Chart."
-            default y if !LV_CONF_MINIMAL
         config LV_USE_DROPDOWN
             bool "Drop down list. Requires: lv_label."
             select LV_USE_LABEL
@@ -618,18 +730,17 @@ menu "LVGL configuration"
         config LV_USE_LABEL
             bool "Label."
             default y if !LV_CONF_MINIMAL
-        config LV_LABEL_TEXT_SEL
+        config LV_LABEL_TEXT_SELECTION
             bool "Enable selecting text of the label."
             depends on LV_USE_LABEL
+            default y
         config LV_LABEL_LONG_TXT_HINT
             bool "Store extra some info in labels (12 bytes) to speed up drawing of very long texts."
             depends on LV_USE_LABEL
+            default y
         config LV_USE_LINE
             bool "Line."
             default y if !LV_CONF_MINIMAL
-        config LV_USE_METER
-            bool "Meter."
-            default y if !LV_CONF_MINIMAL
         config LV_USE_ROLLER
             bool "Roller. Requires: lv_label."
             select LV_USE_LABEL
@@ -643,15 +754,14 @@ menu "LVGL configuration"
             select LV_USE_BAR
             default y if !LV_CONF_MINIMAL
         config LV_USE_SWITCH
-            bool "Switch. Dependencies: lv_slider."
-            select LV_USE_SLIDER
+            bool "Switch."
             default y if !LV_CONF_MINIMAL
         config LV_USE_TEXTAREA
             bool "Text area. Requires: lv_label."
             select LV_USE_LABEL
             default y if !LV_CONF_MINIMAL
-        config LV_TEXTAREA_DEF_PWN_SHOW_TIME
-            int "Text area def. pwn show time [ms]."
+        config LV_TEXTAREA_DEF_PWD_SHOW_TIME
+            int "Text area def. pwd show time [ms]."
             default 1500
             depends on LV_USE_TEXTAREA
         config LV_USE_TABLE
@@ -659,10 +769,9 @@ menu "LVGL configuration"
             default y if !LV_CONF_MINIMAL
     endmenu
 
-    menu "Extra components"
-	config LV_USE_ANIMIMG
+    menu "Extra Widgets"
+        config LV_USE_ANIMIMG
             bool "Anim image."
-            select LV_USE_IMG
             default y if !LV_CONF_MINIMAL
         config LV_USE_CALENDAR
             bool "Calendar."
@@ -672,43 +781,251 @@ menu "LVGL configuration"
             depends on LV_USE_CALENDAR
         config LV_USE_CALENDAR_HEADER_ARROW
             bool "Use calendar header arrow"
+            depends on LV_USE_CALENDAR
             default y
         config LV_USE_CALENDAR_HEADER_DROPDOWN
             bool "Use calendar header dropdown"
+            depends on LV_USE_CALENDAR
             default y
+        config LV_USE_CHART
+            bool "Chart."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_COLORWHEEL
             bool "Colorwheel."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_IMGBTN
             bool "Imgbtn."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_KEYBOARD
             bool "Keyboard."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_LED
             bool "LED."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_LIST
             bool "List."
+            default y if !LV_CONF_MINIMAL
+        config LV_USE_MENU
+            bool "Menu."
+            default y if !LV_CONF_MINIMAL
+        config LV_USE_METER
+            bool "Meter."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_MSGBOX
             bool "Msgbox."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_SPINBOX
             bool "Spinbox."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_SPINNER
             bool "Spinner."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_TABVIEW
             bool "Tabview."
+            default y if !LV_CONF_MINIMAL
         config LV_USE_TILEVIEW
             bool "Tileview"
+            default y if !LV_CONF_MINIMAL
         config LV_USE_WIN
             bool "Win"
+            default y if !LV_CONF_MINIMAL
         config LV_USE_SPAN
             bool "span"
+            default y if !LV_CONF_MINIMAL
+        config LV_SPAN_SNIPPET_STACK_SIZE
+            int "Maximum number of span descriptor"
+            default 64
+            depends on LV_USE_SPAN
+    endmenu
+
+    menu "Themes"
+        config LV_USE_THEME_DEFAULT
+            bool "A simple, impressive and very complete theme"
+            default y if !LV_CONF_MINIMAL
+        config LV_THEME_DEFAULT_DARK
+            bool "Yes to set dark mode, No to set light mode"
+            depends on LV_USE_THEME_DEFAULT
+        config LV_THEME_DEFAULT_GROW
+            bool "Enable grow on press"
+            default y
+            depends on LV_USE_THEME_DEFAULT
+        config LV_THEME_DEFAULT_TRANSITION_TIME
+            int "Default transition time in [ms]"
+            default 80
+            depends on LV_USE_THEME_DEFAULT
+        config LV_USE_THEME_BASIC
+            bool "A very simple theme that is a good starting point for a custom theme"
+            default y if !LV_CONF_MINIMAL
     endmenu
 
     menu "Layouts"
         config LV_USE_FLEX
             bool "A layout similar to Flexbox in CSS."
-            default y
+            default y if !LV_CONF_MINIMAL
         config LV_USE_GRID
             bool "A layout similar to Grid in CSS."
-            default y
+            default y if !LV_CONF_MINIMAL
+    endmenu
+
+    menu "3rd Party Libraries"
+        config LV_USE_FS_STDIO
+            bool "File system on top of stdio API"
+        config LV_FS_STDIO_LETTER
+            string "Set an upper cased letter on which the drive will accessible (e.g. 'A' i.e. 65 )"
+            depends on LV_USE_FS_STDIO != 0
+        config LV_FS_STDIO_PATH
+            string "Set the working directory"
+            depends on LV_USE_FS_STDIO != 0
+        config LV_FS_STDIO_CACHE_SIZE
+            string ">0 to cache this number of bytes in lv_fs_read()"
+            depends on LV_USE_FS_STDIO != 0
+
+        config LV_USE_FS_POSIX
+            bool "File system on top of posix API"
+        config LV_FS_POSIX_LETTER
+            int "Set an upper cased letter on which the drive will accessible (e.g. 'A' i.e. 65)"
+            default 0
+            depends on LV_USE_FS_POSIX != 0
+        config LV_FS_POSIX_PATH
+            string "Set the working directory"
+            depends on LV_USE_FS_POSIX != 0
+        config LV_FS_POSIX_CACHE_SIZE
+            int ">0 to cache this number of bytes in lv_fs_read()"
+            default 0
+            depends on LV_USE_FS_POSIX != 0
+
+        config LV_USE_FS_WIN32
+            bool "File system on top of Win32 API"
+        config LV_FS_WIN32_LETTER
+            int "Set an upper cased letter on which the drive will accessible (e.g. 'A' i.e. 65)"
+            default 0
+            depends on LV_USE_FS_WIN32 != 0
+        config LV_FS_WIN32_PATH
+            string "Set the working directory"
+            depends on LV_USE_FS_WIN32 != 0
+        config LV_FS_WIN32_CACHE_SIZE
+            int ">0 to cache this number of bytes in lv_fs_read()"
+            default 0
+            depends on LV_USE_FS_WIN32 != 0
+
+        config LV_USE_FS_FATFS
+            bool "File system on top of FatFS"
+        config LV_FS_FATFS_LETTER
+            int "Set an upper cased letter on which the drive will accessible (e.g. 'A' i.e. 65)"
+            default 0
+            depends on LV_USE_FS_FATFS != 0
+        config LV_FS_FATFS_CACHE_SIZE
+            int ">0 to cache this number of bytes in lv_fs_read()"
+            default 0
+            depends on LV_USE_FS_FATFS != 0
+
+        config LV_USE_PNG
+            bool "PNG decoder library"
+
+        config LV_USE_BMP
+            bool "BMP decoder library"
+
+        config LV_USE_SJPG
+            bool "JPG + split JPG decoder library"
+
+        config LV_USE_GIF
+            bool "GIF decoder library"
+
+        config LV_USE_QRCODE
+            bool "QR code library"
+
+        config LV_USE_FREETYPE
+            bool "FreeType library"
+        if LV_USE_FREETYPE
+            menu "FreeType cache config"
+                config LV_FREETYPE_CACHE_SIZE
+                int "Memory used by FreeType to cache characters [bytes] (-1: no caching)"
+                default 16384
+                if LV_FREETYPE_CACHE_SIZE >= 0
+                    config LV_FREETYPE_SBIT_CACHE
+                        bool "enable sbit cache"
+                        default n
+                    config LV_FREETYPE_CACHE_FT_FACES
+                        int "The maximum number of FT_Face(0: use defaults)"
+                        default 0
+                    config LV_FREETYPE_CACHE_FT_SIZES
+                        int "The maximum number of FT_Size(0: use defaults)"
+                        default 0
+                endif
+            endmenu
+        endif
+
+        config LV_USE_RLOTTIE
+            bool "Lottie library"
+
+        config LV_USE_FFMPEG
+            bool "FFmpeg library"
+        config LV_FFMPEG_AV_DUMP_FORMAT
+            bool "Dump av format"
+            depends on LV_USE_FFMPEG
+            default n
+    endmenu
+
+    menu "Others"
+        config LV_USE_SNAPSHOT
+            bool "Enable API to take snapshot"
+            default y if !LV_CONF_MINIMAL
+
+        config LV_USE_MONKEY
+            bool "Enable Monkey test"
+            default n
+    endmenu
+
+    menu "Examples"
+        config LV_BUILD_EXAMPLES
+            bool "Enable the examples to be built"
+            default y if !LV_CONF_MINIMAL
+    endmenu
+
+    menu "Demos"
+        config LV_USE_DEMO_WIDGETS
+            bool "Show some widget"
+            default n
+        config LV_DEMO_WIDGETS_SLIDESHOW
+            bool "Enable slide show"
+            depends on LV_USE_DEMO_WIDGETS
+            default n
+
+        config LV_USE_DEMO_KEYPAD_AND_ENCODER
+            bool "Demonstrate the usage of encoder and keyboard"
+            default n
+
+        config LV_USE_DEMO_BENCHMARK
+            bool "Benchmark your system"
+            default n
+
+        config LV_USE_DEMO_STRESS
+            bool "Stress test for LVGL"
+            default n
+
+        config LV_USE_DEMO_MUSIC
+            bool "Music player demo"
+            default n
+        config LV_DEMO_MUSIC_SQUARE
+            bool "Enable Square"
+            depends on LV_USE_DEMO_MUSIC
+            default n
+        config LV_DEMO_MUSIC_LANDSCAPE
+            bool "Enable Landscape"
+            depends on LV_USE_DEMO_MUSIC
+            default n
+        config LV_DEMO_MUSIC_ROUND
+            bool "Enable Round"
+            depends on LV_USE_DEMO_MUSIC
+            default n
+        config LV_DEMO_MUSIC_LARGE
+            bool "Enable Large"
+            depends on LV_USE_DEMO_MUSIC
+            default n
+        config LV_DEMO_MUSIC_AUTO_PLAY
+            bool "Enable Auto play"
+            depends on LV_USE_DEMO_MUSIC
+            default n
     endmenu
 
 endmenu
diff --git a/lib/libesp32_lvgl/lvgl/README.md b/lib/libesp32_lvgl/lvgl/README.md
index acc5c054a..e8a452ee1 100644
--- a/lib/libesp32_lvgl/lvgl/README.md
+++ b/lib/libesp32_lvgl/lvgl/README.md
@@ -16,6 +16,10 @@ LVGL provides everything you need to create an embedded GUI with easy-to-use gra
 <a href="https://docs.lvgl.io/master/examples.html">Interactive examples</a>
 </h4>
 
+
+**English** | [中文](./README_zh.md) |
+
+
 ---
 
 #### Table of content
@@ -25,7 +29,6 @@ LVGL provides everything you need to create an embedded GUI with easy-to-use gra
 - [Services](#services)
 - [Contributing](#contributing)
 
-
 ## Overview
 ### Features
 * Powerful [building blocks](https://docs.lvgl.io/master/widgets/index.html): buttons, charts, lists, sliders, images, etc.
@@ -39,7 +42,7 @@ LVGL provides everything you need to create an embedded GUI with easy-to-use gra
 * Powerful layouts inspired by CSS: [Flexbox](https://docs.lvgl.io/master/layouts/flex.html) and [Grid](https://docs.lvgl.io/master/layouts/grid.html)
 * OS, External memory and GPU are supported but not required. (built in support for STM32 DMA2D, and NXP PXP and VGLite)
 * Smooth rendering even with a [single frame buffer](https://docs.lvgl.io/master/porting/display.html)
-* Written in C and compatibile with C++
+* Written in C and compatible with C++
 * Micropython Binding exposes [LVGL API in Micropython](https://blog.lvgl.io/2019-02-20/micropython-bindings)
 * [Simulator](https://docs.lvgl.io/master/get-started/pc-simulator.html) to develop on PC without embedded hardware
 * 100+ simple [Examples](https://github.com/lvgl/lvgl/tree/master/examples)
@@ -102,13 +105,14 @@ Just to mention some platforms:
 - Nordic NRF52 Bluetooth modules
 - Quectel modems
 
-LVGL is also avaiable as:
+LVGL is also available as:
 - [Arduino library](https://docs.lvgl.io/master/get-started/arduino.html)
 - [PlatformIO package](https://platformio.org/lib/show/12440/lvgl)
 - [Zephyr library](https://docs.zephyrproject.org/latest/reference/kconfig/CONFIG_LVGL.html)
 - [ESP32 component](https://docs.lvgl.io/master/get-started/espressif.html)
 - [NXP MCUXpresso component](https://www.nxp.com/design/software/embedded-software/lvgl-open-source-graphics-library:LITTLEVGL-OPEN-SOURCE-GRAPHICS-LIBRARY)
 - [NuttX library](https://docs.lvgl.io/master/get-started/nuttx.html)
+- [RT-Thread RTOS](https://docs.lvgl.io/master/get-started/rt-thread.html)
 
 
 ## Get started
@@ -178,4 +182,4 @@ Feel free to contact us if you have any questions.
 LVGL is an open project and contribution is very welcome. There are many ways to contribute from simply speaking about your project, through writing examples, improving the documentation, fixing bugs to hosting your own project under the LVGL organization.
 
 For a detailed description of contribution opportunities visit the [Contributing](https://docs.lvgl.io/master/CONTRIBUTING.html) section of the documentation.
- 
+
diff --git a/lib/libesp32_lvgl/lvgl/library.json b/lib/libesp32_lvgl/lvgl/library.json
index f42b43d6a..79cf2c0e1 100644
--- a/lib/libesp32_lvgl/lvgl/library.json
+++ b/lib/libesp32_lvgl/lvgl/library.json
@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-	"version": "8.1.0",
+	"version": "8.2.0",
 	"keywords": "graphics, gui, embedded, tft, lvgl",
 	"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
 	"repository": {
diff --git a/lib/libesp32_lvgl/lvgl/library.properties b/lib/libesp32_lvgl/lvgl/library.properties
index cefc1def8..99a97ed6e 100644
--- a/lib/libesp32_lvgl/lvgl/library.properties
+++ b/lib/libesp32_lvgl/lvgl/library.properties
@@ -1,5 +1,5 @@
 name=lvgl
-version=8.1.0
+version=8.2.0
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems
diff --git a/lib/libesp32_lvgl/lvgl/lv_conf_template.h b/lib/libesp32_lvgl/lvgl/lv_conf_template.h
index 8bdddb497..c268d269b 100644
--- a/lib/libesp32_lvgl/lvgl/lv_conf_template.h
+++ b/lib/libesp32_lvgl/lvgl/lv_conf_template.h
@@ -1,6 +1,6 @@
 /**
  * @file lv_conf.h
- * Configuration file for v8.1.0
+ * Configuration file for v8.2.0
  */
 
 /*
@@ -48,22 +48,22 @@
 /*1: use custom malloc/free, 0: use the built-in `lv_mem_alloc()` and `lv_mem_free()`*/
 #define LV_MEM_CUSTOM 0
 #if LV_MEM_CUSTOM == 0
-/*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/
-#  define LV_MEM_SIZE (32U * 1024U)          /*[bytes]*/
+    /*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/
+    #define LV_MEM_SIZE (48U * 1024U)          /*[bytes]*/
 
-/*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/
-#  define LV_MEM_ADR 0     /*0: unused*/
-/*Instead of an address give a memory allocator that will be called to get a memory pool for LVGL. E.g. my_malloc*/
-#if LV_MEM_ADR == 0
-//#define LV_MEM_POOL_INCLUDE your_alloc_library  /* Uncomment if using an external allocator*/
-//#define LV_MEM_POOL_ALLOC   your_alloc          /* Uncomment if using an external allocator*/
-#endif
+    /*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/
+    #define LV_MEM_ADR 0     /*0: unused*/
+    /*Instead of an address give a memory allocator that will be called to get a memory pool for LVGL. E.g. my_malloc*/
+    #if LV_MEM_ADR == 0
+        //#define LV_MEM_POOL_INCLUDE your_alloc_library  /* Uncomment if using an external allocator*/
+        //#define LV_MEM_POOL_ALLOC   your_alloc          /* Uncomment if using an external allocator*/
+    #endif
 
 #else       /*LV_MEM_CUSTOM*/
-#  define LV_MEM_CUSTOM_INCLUDE <stdlib.h>   /*Header for the dynamic memory function*/
-#  define LV_MEM_CUSTOM_ALLOC   malloc
-#  define LV_MEM_CUSTOM_FREE    free
-#  define LV_MEM_CUSTOM_REALLOC realloc
+    #define LV_MEM_CUSTOM_INCLUDE <stdlib.h>   /*Header for the dynamic memory function*/
+    #define LV_MEM_CUSTOM_ALLOC   malloc
+    #define LV_MEM_CUSTOM_FREE    free
+    #define LV_MEM_CUSTOM_REALLOC realloc
 #endif     /*LV_MEM_CUSTOM*/
 
 /*Number of the intermediate memory buffer used during rendering and other internal processing mechanisms.
@@ -87,8 +87,8 @@
  *It removes the need to manually update the tick with `lv_tick_inc()`)*/
 #define LV_TICK_CUSTOM 0
 #if LV_TICK_CUSTOM
-#define LV_TICK_CUSTOM_INCLUDE "Arduino.h"         /*Header for the system time function*/
-#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis())    /*Expression evaluating to current system time in ms*/
+    #define LV_TICK_CUSTOM_INCLUDE "Arduino.h"         /*Header for the system time function*/
+    #define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis())    /*Expression evaluating to current system time in ms*/
 #endif   /*LV_TICK_CUSTOM*/
 
 /*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings.
@@ -108,17 +108,16 @@
 #define LV_DRAW_COMPLEX 1
 #if LV_DRAW_COMPLEX != 0
 
-/*Allow buffering some shadow calculation.
- *LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius`
- *Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/
-#define LV_SHADOW_CACHE_SIZE 0
-
-/* Set number of maximally cached circle data.
- * The circumference of 1/4 circle are saved for anti-aliasing
- * radius * 4 bytes are used per circle (the most often used radiuses are saved)
- * 0: to disable caching */
-#define LV_CIRCLE_CACHE_SIZE 4
+    /*Allow buffering some shadow calculation.
+    *LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius`
+    *Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/
+    #define LV_SHADOW_CACHE_SIZE 0
 
+    /* Set number of maximally cached circle data.
+    * The circumference of 1/4 circle are saved for anti-aliasing
+    * radius * 4 bytes are used per circle (the most often used radiuses are saved)
+    * 0: to disable caching */
+    #define LV_CIRCLE_CACHE_SIZE 4
 #endif /*LV_DRAW_COMPLEX*/
 
 /*Default image cache size. Image caching keeps the images opened.
@@ -126,9 +125,32 @@
  *With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images.
  *However the opened images might consume additional RAM.
  *0: to disable caching*/
-#define LV_IMG_CACHE_DEF_SIZE 0
+#define LV_IMG_CACHE_DEF_SIZE   0
 
-/*Maximum buffer size to allocate for rotation. Only used if software rotation is enabled in the display driver.*/
+/*Number of stops allowed per gradient. Increase this to allow more stops.
+ *This adds (sizeof(lv_color_t) + 1) bytes per additional stop*/
+#define LV_GRADIENT_MAX_STOPS       2
+
+/*Default gradient buffer size.
+ *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again.
+ *LV_GRAD_CACHE_DEF_SIZE sets the size of this cache in bytes.
+ *If the cache is too small the map will be allocated only while it's required for the drawing.
+ *0 mean no caching.*/
+#define LV_GRAD_CACHE_DEF_SIZE      0
+
+/*Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display)
+ *LV_DITHER_GRADIENT implies allocating one or two more lines of the object's rendering surface
+ *The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */
+#define LV_DITHER_GRADIENT      0
+#if LV_DITHER_GRADIENT
+    /*Add support for error diffusion dithering.
+     *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing.
+     *The increase in memory consumption is (24 bits * object's width)*/
+    #define LV_DITHER_ERROR_DIFFUSION   0
+#endif
+
+/*Maximum buffer size to allocate for rotation.
+ *Only used if software rotation is enabled in the display driver.*/
 #define LV_DISP_ROT_MAX_BUF (10*1024)
 
 /*-------------
@@ -138,32 +160,33 @@
 /*Use STM32's DMA2D (aka Chrom Art) GPU*/
 #define LV_USE_GPU_STM32_DMA2D 0
 #if LV_USE_GPU_STM32_DMA2D
-/*Must be defined to include path of CMSIS header of target processor
-e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
-#define LV_GPU_DMA2D_CMSIS_INCLUDE
+    /*Must be defined to include path of CMSIS header of target processor
+    e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
+    #define LV_GPU_DMA2D_CMSIS_INCLUDE
 #endif
 
 /*Use NXP's PXP GPU iMX RTxxx platforms*/
 #define LV_USE_GPU_NXP_PXP 0
 #if LV_USE_GPU_NXP_PXP
-/*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c)
- *   and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS
- *   has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected.
- *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init()
- */
-#define LV_USE_GPU_NXP_PXP_AUTO_INIT 0
+    /*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c)
+    *   and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS
+    *   has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected.
+    *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init()
+    */
+    #define LV_USE_GPU_NXP_PXP_AUTO_INIT 0
 #endif
 
 /*Use NXP's VG-Lite GPU iMX RTxxx platforms*/
 #define LV_USE_GPU_NXP_VG_LITE 0
 
-/*Use exnternal renderer*/
-#define LV_USE_EXTERNAL_RENDERER 0
-
-/*Use SDL renderer API. Requires LV_USE_EXTERNAL_RENDERER*/
+/*Use SDL renderer API*/
 #define LV_USE_GPU_SDL 0
 #if LV_USE_GPU_SDL
-#  define LV_GPU_SDL_INCLUDE_PATH <SDL2/SDL.h>
+    #define LV_GPU_SDL_INCLUDE_PATH <SDL2/SDL.h>
+    /*Texture cache size, 8MB by default*/
+    #define LV_GPU_SDL_LRU_SIZE (1024 * 1024 * 8)
+    /*Custom blend mode for mask drawing, disable if you need to link with older SDL2 lib*/
+    #define LV_GPU_SDL_CUSTOM_BLEND_MODE (SDL_VERSION_ATLEAST(2, 0, 6))
 #endif
 
 /*-------------
@@ -174,28 +197,28 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_USE_LOG 0
 #if LV_USE_LOG
 
-/*How important log should be added:
- *LV_LOG_LEVEL_TRACE       A lot of logs to give detailed information
- *LV_LOG_LEVEL_INFO        Log important events
- *LV_LOG_LEVEL_WARN        Log if something unwanted happened but didn't cause a problem
- *LV_LOG_LEVEL_ERROR       Only critical issue, when the system may fail
- *LV_LOG_LEVEL_USER        Only logs added by the user
- *LV_LOG_LEVEL_NONE        Do not log anything*/
-#  define LV_LOG_LEVEL LV_LOG_LEVEL_WARN
+    /*How important log should be added:
+    *LV_LOG_LEVEL_TRACE       A lot of logs to give detailed information
+    *LV_LOG_LEVEL_INFO        Log important events
+    *LV_LOG_LEVEL_WARN        Log if something unwanted happened but didn't cause a problem
+    *LV_LOG_LEVEL_ERROR       Only critical issue, when the system may fail
+    *LV_LOG_LEVEL_USER        Only logs added by the user
+    *LV_LOG_LEVEL_NONE        Do not log anything*/
+    #define LV_LOG_LEVEL LV_LOG_LEVEL_WARN
 
-/*1: Print the log with 'printf';
- *0: User need to register a callback with `lv_log_register_print_cb()`*/
-#  define LV_LOG_PRINTF 0
+    /*1: Print the log with 'printf';
+    *0: User need to register a callback with `lv_log_register_print_cb()`*/
+    #define LV_LOG_PRINTF 0
 
-/*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/
-#  define LV_LOG_TRACE_MEM        1
-#  define LV_LOG_TRACE_TIMER      1
-#  define LV_LOG_TRACE_INDEV      1
-#  define LV_LOG_TRACE_DISP_REFR  1
-#  define LV_LOG_TRACE_EVENT      1
-#  define LV_LOG_TRACE_OBJ_CREATE 1
-#  define LV_LOG_TRACE_LAYOUT     1
-#  define LV_LOG_TRACE_ANIM       1
+    /*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/
+    #define LV_LOG_TRACE_MEM        1
+    #define LV_LOG_TRACE_TIMER      1
+    #define LV_LOG_TRACE_INDEV      1
+    #define LV_LOG_TRACE_DISP_REFR  1
+    #define LV_LOG_TRACE_EVENT      1
+    #define LV_LOG_TRACE_OBJ_CREATE 1
+    #define LV_LOG_TRACE_LAYOUT     1
+    #define LV_LOG_TRACE_ANIM       1
 
 #endif  /*LV_USE_LOG*/
 
@@ -219,17 +242,17 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  * Others
  *-----------*/
 
-/*1: Show CPU usage and FPS count in the right bottom corner*/
+/*1: Show CPU usage and FPS count*/
 #define LV_USE_PERF_MONITOR 0
 #if LV_USE_PERF_MONITOR
-#define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
+    #define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
 #endif
 
-/*1: Show the used memory and the memory fragmentation in the left bottom corner
+/*1: Show the used memory and the memory fragmentation
  * Requires LV_MEM_CUSTOM = 0*/
 #define LV_USE_MEM_MONITOR 0
-#if LV_USE_PERF_MONITOR
-#define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
+#if LV_USE_MEM_MONITOR
+    #define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
 #endif
 
 /*1: Draw random colored rectangles over the redrawn areas*/
@@ -238,11 +261,11 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Change the built in (v)snprintf functions*/
 #define LV_SPRINTF_CUSTOM 0
 #if LV_SPRINTF_CUSTOM
-#  define LV_SPRINTF_INCLUDE <stdio.h>
-#  define lv_snprintf  snprintf
-#  define lv_vsnprintf vsnprintf
+    #define LV_SPRINTF_INCLUDE <stdio.h>
+    #define lv_snprintf  snprintf
+    #define lv_vsnprintf vsnprintf
 #else   /*LV_SPRINTF_CUSTOM*/
-#  define LV_SPRINTF_USE_FLOAT 0
+    #define LV_SPRINTF_USE_FLOAT 0
 #endif  /*LV_SPRINTF_CUSTOM*/
 
 #define LV_USE_USER_DATA 1
@@ -251,7 +274,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  *Used if lvgl is bound to higher level language and the memory is managed by that language*/
 #define LV_ENABLE_GC 0
 #if LV_ENABLE_GC != 0
-#  define LV_GC_INCLUDE "gc.h"                           /*Include Garbage Collector related things*/
+    #define LV_GC_INCLUDE "gc.h"                           /*Include Garbage Collector related things*/
 #endif /*LV_ENABLE_GC*/
 
 /*=====================
@@ -280,7 +303,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Attribute to mark large constant arrays for example font's bitmaps*/
 #define LV_ATTRIBUTE_LARGE_CONST
 
-/*Complier prefix for a big array declaration in RAM*/
+/*Compiler prefix for a big array declaration in RAM*/
 #define LV_ATTRIBUTE_LARGE_RAM_ARRAY
 
 /*Place performance critical functions into a faster memory (e.g RAM)*/
@@ -327,7 +350,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Demonstrate special features*/
 #define LV_FONT_MONTSERRAT_12_SUBPX      0
 #define LV_FONT_MONTSERRAT_28_COMPRESSED 0  /*bpp = 3*/
-#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0  /*Hebrew, Arabic, Perisan letters and all their forms*/
+#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0  /*Hebrew, Arabic, Persian letters and all their forms*/
 #define LV_FONT_SIMSUN_16_CJK            0  /*1000 most common CJK radicals*/
 
 /*Pixel perfect monospace fonts*/
@@ -353,8 +376,8 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Enable subpixel rendering*/
 #define LV_USE_FONT_SUBPX 0
 #if LV_USE_FONT_SUBPX
-/*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/
-#define LV_FONT_SUBPX_BGR 0  /*0: RGB; 1:BGR order*/
+    /*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/
+    #define LV_FONT_SUBPX_BGR 0  /*0: RGB; 1:BGR order*/
 #endif
 
 /*=================
@@ -369,7 +392,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  */
 #define LV_TXT_ENC LV_TXT_ENC_UTF8
 
- /*Can break (wrap) texts on these chars*/
+/*Can break (wrap) texts on these chars*/
 #define LV_TXT_BREAK_CHARS " ,.;:-_"
 
 /*If a word is at least this long, will break wherever "prettiest"
@@ -392,11 +415,11 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
 #define LV_USE_BIDI 0
 #if LV_USE_BIDI
-/*Set the default direction. Supported values:
- *`LV_BASE_DIR_LTR` Left-to-Right
- *`LV_BASE_DIR_RTL` Right-to-Left
- *`LV_BASE_DIR_AUTO` detect texts base direction*/
-#define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO
+    /*Set the default direction. Supported values:
+    *`LV_BASE_DIR_LTR` Left-to-Right
+    *`LV_BASE_DIR_RTL` Right-to-Left
+    *`LV_BASE_DIR_AUTO` detect texts base direction*/
+    #define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO
 #endif
 
 /*Enable Arabic/Persian processing
@@ -429,15 +452,15 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 
 #define LV_USE_LABEL      1
 #if LV_USE_LABEL
-#  define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/
-#  define LV_LABEL_LONG_TXT_HINT 1  /*Store some extra info in labels to speed up drawing of very long texts*/
+    #define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/
+    #define LV_LABEL_LONG_TXT_HINT 1  /*Store some extra info in labels to speed up drawing of very long texts*/
 #endif
 
 #define LV_USE_LINE       1
 
 #define LV_USE_ROLLER     1   /*Requires: lv_label*/
 #if LV_USE_ROLLER
-#  define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/
+    #define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/
 #endif
 
 #define LV_USE_SLIDER     1   /*Requires: lv_bar*/
@@ -446,7 +469,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 
 #define LV_USE_TEXTAREA   1   /*Requires: lv_label*/
 #if LV_USE_TEXTAREA != 0
-#  define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500    /*ms*/
+    #define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500    /*ms*/
 #endif
 
 #define LV_USE_TABLE      1
@@ -460,16 +483,16 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  *----------*/
 #define LV_USE_CALENDAR   1
 #if LV_USE_CALENDAR
-# define LV_CALENDAR_WEEK_STARTS_MONDAY 0
-# if LV_CALENDAR_WEEK_STARTS_MONDAY
-#  define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"}
-# else
-#  define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"}
-# endif
+    #define LV_CALENDAR_WEEK_STARTS_MONDAY 0
+    #if LV_CALENDAR_WEEK_STARTS_MONDAY
+        #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"}
+    #else
+        #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"}
+    #endif
 
-# define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March",  "April", "May",  "June", "July", "August", "September", "October", "November", "December"}
-# define LV_USE_CALENDAR_HEADER_ARROW 1
-# define LV_USE_CALENDAR_HEADER_DROPDOWN 1
+    #define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March",  "April", "May",  "June", "July", "August", "September", "October", "November", "December"}
+    #define LV_USE_CALENDAR_HEADER_ARROW 1
+    #define LV_USE_CALENDAR_HEADER_DROPDOWN 1
 #endif  /*LV_USE_CALENDAR*/
 
 #define LV_USE_CHART      1
@@ -484,6 +507,8 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 
 #define LV_USE_LIST       1
 
+#define LV_USE_MENU       1
+
 #define LV_USE_METER      1
 
 #define LV_USE_MSGBOX     1
@@ -500,8 +525,8 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 
 #define LV_USE_SPAN       1
 #if LV_USE_SPAN
-/*A line text can contain maximum num of span descriptor */
-#  define LV_SPAN_SNIPPET_STACK_SIZE 64
+    /*A line text can contain maximum num of span descriptor */
+    #define LV_SPAN_SNIPPET_STACK_SIZE 64
 #endif
 
 /*-----------
@@ -512,18 +537,18 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_USE_THEME_DEFAULT 1
 #if LV_USE_THEME_DEFAULT
 
-/*0: Light mode; 1: Dark mode*/
-# define LV_THEME_DEFAULT_DARK 0
+    /*0: Light mode; 1: Dark mode*/
+    #define LV_THEME_DEFAULT_DARK 0
 
-/*1: Enable grow on press*/
-# define LV_THEME_DEFAULT_GROW 1
+    /*1: Enable grow on press*/
+    #define LV_THEME_DEFAULT_GROW 1
 
-/*Default transition time in [ms]*/
-# define LV_THEME_DEFAULT_TRANSITION_TIME 80
+    /*Default transition time in [ms]*/
+    #define LV_THEME_DEFAULT_TRANSITION_TIME 80
 #endif /*LV_USE_THEME_DEFAULT*/
 
 /*A very simple theme that is a good starting point for a custom theme*/
- #define LV_USE_THEME_BASIC 1
+#define LV_USE_THEME_BASIC 1
 
 /*A theme designed for monochrome displays*/
 #define LV_USE_THEME_MONO 1
@@ -542,18 +567,38 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  * 3rd party libraries
  *--------------------*/
 
-/*File system interfaces for common APIs
- *To enable set a driver letter for that API*/
-#define LV_USE_FS_STDIO '\0'        /*Uses fopen, fread, etc*/
-//#define LV_FS_STDIO_PATH "/home/john/"    /*Set the working directory. If commented it will be "./" */
+/*File system interfaces for common APIs */
 
-#define LV_USE_FS_POSIX '\0'        /*Uses open, read, etc*/
-//#define LV_FS_POSIX_PATH "/home/john/"    /*Set the working directory. If commented it will be "./" */
+/*API for fopen, fread, etc*/
+#define LV_USE_FS_STDIO 0
+#if LV_USE_FS_STDIO
+    #define LV_FS_STDIO_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_STDIO_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_STDIO_CACHE_SIZE  0   /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
 
-#define LV_USE_FS_WIN32 '\0'        /*Uses CreateFile, ReadFile, etc*/
-//#define LV_FS_WIN32_PATH "C:\\Users\\john\\"    /*Set the working directory. If commented it will be ".\\" */
+/*API for open, read, etc*/
+#define LV_USE_FS_POSIX 0
+#if LV_USE_FS_POSIX
+    #define LV_FS_POSIX_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_POSIX_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_POSIX_CACHE_SIZE  0   /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
 
-#define LV_USE_FS_FATFS '\0'        /*Uses f_open, f_read, etc*/
+/*API for CreateFile, ReadFile, etc*/
+#define LV_USE_FS_WIN32 0
+#if LV_USE_FS_WIN32
+    #define LV_FS_WIN32_LETTER  '\0'    /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_WIN32_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_WIN32_CACHE_SIZE 0    /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
+
+/*API for FATFS (needs to be added separately). Uses f_open, f_read, etc*/
+#define LV_USE_FS_FATFS  0
+#if LV_USE_FS_FATFS
+    #define LV_FS_FATFS_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_FATFS_CACHE_SIZE 0    /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
 
 /*PNG decoder library*/
 #define LV_USE_PNG 0
@@ -574,20 +619,43 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*FreeType library*/
 #define LV_USE_FREETYPE 0
 #if LV_USE_FREETYPE
-/*Memory used by FreeType to cache characters [bytes] (-1: no caching)*/
-# define LV_FREETYPE_CACHE_SIZE (16 * 1024)
+    /*Memory used by FreeType to cache characters [bytes] (-1: no caching)*/
+    #define LV_FREETYPE_CACHE_SIZE (16 * 1024)
+    #if LV_FREETYPE_CACHE_SIZE >= 0
+        /* 1: bitmap cache use the sbit cache, 0:bitmap cache use the image cache. */
+        /* sbit cache:it is much more memory efficient for small bitmaps(font size < 256) */
+        /* if font size >= 256, must be configured as image cache */
+        #define LV_FREETYPE_SBIT_CACHE 0
+        /* Maximum number of opened FT_Face/FT_Size objects managed by this cache instance. */
+        /* (0:use system defaults) */
+        #define LV_FREETYPE_CACHE_FT_FACES 0
+        #define LV_FREETYPE_CACHE_FT_SIZES 0
+    #endif
 #endif
 
 /*Rlottie library*/
 #define LV_USE_RLOTTIE 0
 
+/*FFmpeg library for image decoding and playing videos
+ *Supports all major image formats so do not enable other image decoder with it*/
+#define LV_USE_FFMPEG  0
+#if LV_USE_FFMPEG
+    /*Dump input information to stderr*/
+    #define LV_FFMPEG_AV_DUMP_FORMAT 0
+#endif
+
 /*-----------
  * Others
  *----------*/
 
 /*1: Enable API to take snapshot for object*/
-#define LV_USE_SNAPSHOT 1
+#define LV_USE_SNAPSHOT 0
 
+/*1: Enable Monkey test*/
+#define LV_USE_MONKEY   0
+
+/*1: Enable grid navigation*/
+#define LV_USE_GRIDNAV  0
 
 /*==================
 * EXAMPLES
@@ -596,6 +664,35 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Enable the examples to be built with the library*/
 #define LV_BUILD_EXAMPLES 1
 
+/*===================
+ * DEMO USAGE
+ ====================*/
+
+/*Show some widget. It might be required to increase `LV_MEM_SIZE` */
+#define LV_USE_DEMO_WIDGETS        0
+#if LV_USE_DEMO_WIDGETS
+#define LV_DEMO_WIDGETS_SLIDESHOW  0
+#endif
+
+/*Demonstrate the usage of encoder and keyboard*/
+#define LV_USE_DEMO_KEYPAD_AND_ENCODER     0
+
+/*Benchmark your system*/
+#define LV_USE_DEMO_BENCHMARK   0
+
+/*Stress test for LVGL*/
+#define LV_USE_DEMO_STRESS      0
+
+/*Music player demo*/
+#define LV_USE_DEMO_MUSIC       0
+#if LV_USE_DEMO_MUSIC
+# define LV_DEMO_MUSIC_SQUARE       0
+# define LV_DEMO_MUSIC_LANDSCAPE    0
+# define LV_DEMO_MUSIC_ROUND        0
+# define LV_DEMO_MUSIC_LARGE        0
+# define LV_DEMO_MUSIC_AUTO_PLAY    0
+#endif
+
 /*--END OF LV_CONF_H--*/
 
 #endif /*LV_CONF_H*/
diff --git a/lib/libesp32_lvgl/lvgl/lvgl.h b/lib/libesp32_lvgl/lvgl/lvgl.h
index 6717b4310..df96d213d 100644
--- a/lib/libesp32_lvgl/lvgl/lvgl.h
+++ b/lib/libesp32_lvgl/lvgl/lvgl.h
@@ -14,7 +14,7 @@ extern "C" {
  * CURRENT VERSION OF LVGL
  ***************************/
 #define LVGL_VERSION_MAJOR 8
-#define LVGL_VERSION_MINOR 1
+#define LVGL_VERSION_MINOR 2
 #define LVGL_VERSION_PATCH 0
 #define LVGL_VERSION_INFO ""
 
diff --git a/lib/libesp32_lvgl/lvgl/lvgl.mk b/lib/libesp32_lvgl/lvgl/lvgl.mk
index 664987aa7..a57c1d2bb 100644
--- a/lib/libesp32_lvgl/lvgl/lvgl.mk
+++ b/lib/libesp32_lvgl/lvgl/lvgl.mk
@@ -1,9 +1,10 @@
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/examples.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/lv_gpu.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_misc.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_widgets.mk
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_event.c b/lib/libesp32_lvgl/lvgl/src/core/lv_event.c
index c9671fa8d..143ff34b8 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_event.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_event.c
@@ -62,10 +62,11 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_code_t event_code, void * param)
     e.user_data = NULL;
     e.param = param;
     e.deleted = 0;
-
+    e.stop_bubbling = 0;
+    e.stop_processing = 0;
 
     /*Build a simple linked list from the objects used in the events
-     *It's important to know if an this object was deleted by a nested event
+     *It's important to know if this object was deleted by a nested event
      *called from this `event_cb`.*/
     e.prev = event_head;
     event_head = &e;
@@ -86,7 +87,7 @@ lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
     if(class_p == NULL) base = e->current_target->class_p;
     else base = class_p->base_class;
 
-    /*Find a base in which Call the ancestor's event handler_cb is set*/
+    /*Find a base in which call the ancestor's event handler_cb if set*/
     while(base && base->event_cb == NULL) base = base->base_class;
 
     if(base == NULL) return LV_RES_OK;
@@ -116,7 +117,7 @@ lv_obj_t * lv_event_get_current_target(lv_event_t * e)
 
 lv_event_code_t lv_event_get_code(lv_event_t * e)
 {
-    return e->code;
+    return e->code & ~LV_EVENT_PREPROCESS;
 }
 
 void * lv_event_get_param(lv_event_t * e)
@@ -129,6 +130,16 @@ void * lv_event_get_user_data(lv_event_t * e)
     return e->user_data;
 }
 
+void lv_event_stop_bubbling(lv_event_t * e)
+{
+    e->stop_bubbling = 1;
+}
+
+void lv_event_stop_processing(lv_event_t * e)
+{
+    e->stop_processing = 1;
+}
+
 
 uint32_t lv_event_register_id(void)
 {
@@ -240,6 +251,18 @@ bool lv_obj_remove_event_dsc(lv_obj_t * obj, struct _lv_event_dsc_t * event_dsc)
     return false;
 }
 
+void * lv_obj_get_event_user_data(struct _lv_obj_t * obj, lv_event_cb_t event_cb)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+    if(obj->spec_attr == NULL) return false;
+
+    int32_t i = 0;
+    for(i = 0; i < obj->spec_attr->event_dsc_cnt; i++) {
+        if(event_cb == obj->spec_attr->event_dsc[i].cb) return obj->spec_attr->event_dsc[i].user_data;
+    }
+    return NULL;
+}
+
 lv_indev_t * lv_event_get_indev(lv_event_t * e)
 {
 
@@ -279,7 +302,7 @@ lv_obj_draw_part_dsc_t * lv_event_get_draw_part_dsc(lv_event_t * e)
     }
 }
 
-const lv_area_t * lv_event_get_clip_area(lv_event_t * e)
+lv_draw_ctx_t * lv_event_get_draw_ctx(lv_event_t * e)
 {
     if(e->code == LV_EVENT_DRAW_MAIN ||
        e->code == LV_EVENT_DRAW_MAIN_BEGIN ||
@@ -408,18 +431,22 @@ static lv_res_t event_send_core(lv_event_t * e)
     lv_indev_t * indev_act = lv_indev_get_act();
     if(indev_act) {
         if(indev_act->driver->feedback_cb) indev_act->driver->feedback_cb(indev_act->driver, e->code);
+        if(e->stop_processing) return LV_RES_OK;
+        if(e->deleted) return LV_RES_INV;
     }
 
-    lv_event_dsc_t * event_dsc = lv_obj_get_event_dsc(e->current_target, 0);
     lv_res_t res = LV_RES_OK;
-    res = lv_obj_event_base(NULL, e);
+    lv_event_dsc_t * event_dsc = res == LV_RES_INV ? NULL : lv_obj_get_event_dsc(e->current_target, 0);
 
     uint32_t i = 0;
     while(event_dsc && res == LV_RES_OK) {
-        if(event_dsc->cb && (event_dsc->filter == LV_EVENT_ALL || event_dsc->filter == e->code)) {
+        if(event_dsc->cb  && ((event_dsc->filter & LV_EVENT_PREPROCESS) == LV_EVENT_PREPROCESS)
+           && (event_dsc->filter == (LV_EVENT_ALL | LV_EVENT_PREPROCESS) ||
+               (event_dsc->filter & ~LV_EVENT_PREPROCESS) == e->code)) {
             e->user_data = event_dsc->user_data;
             event_dsc->cb(e);
 
+            if(e->stop_processing) return LV_RES_OK;
             /*Stop if the object is deleted*/
             if(e->deleted) return LV_RES_INV;
         }
@@ -428,12 +455,30 @@ static lv_res_t event_send_core(lv_event_t * e)
         event_dsc = lv_obj_get_event_dsc(e->current_target, i);
     }
 
-    if(res == LV_RES_OK && e->current_target->parent && event_is_bubbled(e))
-    {
-            e->current_target = e->current_target->parent;
-            res = event_send_core(e);
-            if(res != LV_RES_OK) return LV_RES_INV;
+    res = lv_obj_event_base(NULL, e);
 
+    event_dsc = res == LV_RES_INV ? NULL : lv_obj_get_event_dsc(e->current_target, 0);
+
+    i = 0;
+    while(event_dsc && res == LV_RES_OK) {
+        if(event_dsc->cb && ((event_dsc->filter & LV_EVENT_PREPROCESS) == 0)
+           && (event_dsc->filter == LV_EVENT_ALL || event_dsc->filter == e->code)) {
+            e->user_data = event_dsc->user_data;
+            event_dsc->cb(e);
+
+            if(e->stop_processing) return LV_RES_OK;
+            /*Stop if the object is deleted*/
+            if(e->deleted) return LV_RES_INV;
+        }
+
+        i++;
+        event_dsc = lv_obj_get_event_dsc(e->current_target, i);
+    }
+
+    if(res == LV_RES_OK && e->current_target->parent && event_is_bubbled(e)) {
+        e->current_target = e->current_target->parent;
+        res = event_send_core(e);
+        if(res != LV_RES_OK) return LV_RES_INV;
     }
 
     return res;
@@ -441,6 +486,8 @@ static lv_res_t event_send_core(lv_event_t * e)
 
 static bool event_is_bubbled(lv_event_t * e)
 {
+    if(e->stop_bubbling) return false;
+
     /*Event codes that always bubble*/
     switch(e->code) {
         case LV_EVENT_CHILD_CREATED:
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_event.h b/lib/libesp32_lvgl/lvgl/src/core/lv_event.h
index dd425543b..038570b72 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_event.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_event.h
@@ -1,5 +1,5 @@
 /**
- * @file lv_templ.h
+ * @file lv_event.h
  *
  */
 
@@ -84,7 +84,11 @@ typedef enum {
     LV_EVENT_LAYOUT_CHANGED,      /**< The children position has changed due to a layout recalculation*/
     LV_EVENT_GET_SELF_SIZE,       /**< Get the internal size of a widget*/
 
-    _LV_EVENT_LAST                /** Number of default events*/
+    _LV_EVENT_LAST,               /** Number of default events*/
+
+
+    LV_EVENT_PREPROCESS = 0x80,   /** This is a flag that can be set with an event so it's processed
+                                      before the class default event processing */
 } lv_event_code_t;
 
 typedef struct _lv_event_t {
@@ -95,6 +99,8 @@ typedef struct _lv_event_t {
     void * param;
     struct _lv_event_t * prev;
     uint8_t deleted : 1;
+    uint8_t stop_processing : 1;
+    uint8_t stop_bubbling : 1;
 } lv_event_t;
 
 /**
@@ -143,7 +149,7 @@ lv_res_t lv_event_send(struct _lv_obj_t * obj, lv_event_code_t event_code, void
  * Used by the widgets internally to call the ancestor widget types's event handler
  * @param class_p   pointer to the class of the widget (NOT the ancestor class)
  * @param e         pointer to the event descriptor
- * @return          LV_RES_OK: the taget object was not deleted in the event; LV_RES_INV: it was deleted in the event_code
+ * @return          LV_RES_OK: the target object was not deleted in the event; LV_RES_INV: it was deleted in the event_code
  */
 lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e);
 
@@ -183,6 +189,19 @@ void * lv_event_get_param(lv_event_t * e);
  */
 void * lv_event_get_user_data(lv_event_t * e);
 
+/**
+ * Stop the event from bubbling.
+ * This is only valid when called in the middle of an event processing chain.
+ * @param e     pointer to the event descriptor
+ */
+void lv_event_stop_bubbling(lv_event_t * e);
+
+/**
+ * Stop processing this event.
+ * This is only valid when called in the middle of an event processing chain.
+ * @param e     pointer to the event descriptor
+ */
+void lv_event_stop_processing(lv_event_t * e);
 
 /**
  * Register a new, custom event ID.
@@ -221,7 +240,7 @@ struct _lv_event_dsc_t * lv_obj_add_event_cb(struct _lv_obj_t * obj, lv_event_cb
 /**
  * Remove an event handler function for an object.
  * @param obj       pointer to an object
- * @param event_cb  the event function to remove, or `NULL` to remove the the firstly added event callback
+ * @param event_cb  the event function to remove, or `NULL` to remove the firstly added event callback
  * @return          true if any event handlers were removed
  */
 bool lv_obj_remove_event_cb(struct _lv_obj_t * obj, lv_event_cb_t event_cb);
@@ -237,7 +256,7 @@ bool lv_obj_remove_event_cb_with_user_data(struct _lv_obj_t * obj, lv_event_cb_t
                                            const void * event_user_data);
 
 /**
- * DEPRACTED because doesn't work if multiple event handlers are added to an object.
+ * DEPRECATED because doesn't work if multiple event handlers are added to an object.
  * Remove an event handler function for an object.
  * @param obj       pointer to an object
  * @param event_dsc pointer to an event descriptor to remove (returned by ::lv_obj_add_event_cb)
@@ -245,6 +264,14 @@ bool lv_obj_remove_event_cb_with_user_data(struct _lv_obj_t * obj, lv_event_cb_t
  */
 bool lv_obj_remove_event_dsc(struct _lv_obj_t * obj, struct _lv_event_dsc_t * event_dsc);
 
+/**
+ * The user data of an event object event callback. Always the first match with `event_cb` will be returned.
+ * @param obj               pointer to an object
+ * @param event_cb          the event function
+ * @return                  the user_data
+ */
+void * lv_obj_get_event_user_data(struct _lv_obj_t * obj, lv_event_cb_t event_cb);
+
 /**
  * Get the input device passed as parameter to indev related events.
  * @param e     pointer to an event
@@ -260,12 +287,12 @@ lv_indev_t * lv_event_get_indev(lv_event_t * e);
 lv_obj_draw_part_dsc_t * lv_event_get_draw_part_dsc(lv_event_t * e);
 
 /**
- * Get the clip area passed as parameter to draw events events.
+ * Get the draw context which should be the first parameter of the draw functions.
  * Namely: `LV_EVENT_DRAW_MAIN/POST`, `LV_EVENT_DRAW_MAIN/POST_BEGIN`, `LV_EVENT_DRAW_MAIN/POST_END`
  * @param e     pointer to an event
- * @return      the clip area to use during drawing or NULL if called on an unrelated event
+ * @return      pointer to a draw context or NULL if called on an unrelated event
  */
-const lv_area_t * lv_event_get_clip_area(lv_event_t * e);
+lv_draw_ctx_t * lv_event_get_draw_ctx(lv_event_t * e);
 
 /**
  * Get the old area of the object before its size was changed. Can be used in `LV_EVENT_SIZE_CHANGED`
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_group.c b/lib/libesp32_lvgl/lvgl/src/core/lv_group.c
index 9a1664672..3e13b0b79 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_group.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_group.c
@@ -82,6 +82,15 @@ void lv_group_del(lv_group_t * group)
         if((*obj)->spec_attr)(*obj)->spec_attr->group_p = NULL;
     }
 
+    /*Remove the group from any indev devices */
+    lv_indev_t * indev = lv_indev_get_next(NULL);
+    while(indev) {
+        if(indev->group == group) {
+            lv_indev_set_group(indev, NULL);
+        }
+        indev = lv_indev_get_next(indev);
+    }
+
     _lv_ll_clear(&(group->obj_ll));
     _lv_ll_remove(&LV_GC_ROOT(_lv_group_ll), group);
     lv_mem_free(group);
@@ -149,8 +158,8 @@ void lv_group_swap_obj(lv_obj_t * obj1, lv_obj_t * obj2)
     /*Do not add the object twice*/
     lv_obj_t ** obj_i;
     _LV_LL_READ(&g1->obj_ll, obj_i) {
-        if((*obj_i) == obj1)(*obj_i) =  obj2;
-        else if((*obj_i) == obj2)(*obj_i) =  obj1;
+        if((*obj_i) == obj1)(*obj_i) = obj2;
+        else if((*obj_i) == obj2)(*obj_i) = obj1;
     }
 
     if(*g1->obj_focus == obj1) lv_group_focus_obj(obj2);
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_indev.c b/lib/libesp32_lvgl/lvgl/src/core/lv_indev.c
index 02a65a28f..079aa943c 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_indev.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_indev.c
@@ -290,32 +290,27 @@ lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point)
 {
     lv_obj_t * found_p = NULL;
 
-    /*If the point is on this object check its children too*/
-    if(lv_obj_hit_test(obj, point)) {
+    /*If this obj is hidden the children are hidden too so return immediately*/
+    if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return NULL;
+
+    bool hit_test_ok = lv_obj_hit_test(obj, point);
+
+    /*If the point is on this object or has overflow visible check its children too*/
+    if(_lv_area_is_point_on(&obj->coords, point, 0) || lv_obj_has_flag(obj, LV_OBJ_FLAG_OVERFLOW_VISIBLE)) {
         int32_t i;
         uint32_t child_cnt = lv_obj_get_child_cnt(obj);
+        /*If a child matches use it*/
         for(i = child_cnt - 1; i >= 0; i--) {
             lv_obj_t * child = obj->spec_attr->children[i];
             found_p = lv_indev_search_obj(child, point);
-
-            /*If a child was found then break*/
-            if(found_p != NULL) break;
-        }
-
-        /*If then the children was not ok, and this obj is clickable
-         * and it or its parent is not hidden then save this object*/
-        if(found_p == NULL && lv_obj_has_flag(obj, LV_OBJ_FLAG_CLICKABLE)) {
-            lv_obj_t * hidden_i = obj;
-            while(hidden_i != NULL) {
-                if(lv_obj_has_flag(hidden_i, LV_OBJ_FLAG_HIDDEN) == true) break;
-                hidden_i = lv_obj_get_parent(hidden_i);
-            }
-            /*No parent found with hidden == true*/
-            if(hidden_i == NULL && (lv_obj_get_state(obj) & LV_STATE_DISABLED) == false) found_p = obj;
+            if(found_p) return found_p;
         }
     }
 
-    return found_p;
+    /*If not return earlier for a clicked child and this obj's hittest was ok use it
+     *else return NULL*/
+    if(hit_test_ok) return obj;
+    else return NULL;
 }
 
 /**********************
@@ -345,12 +340,18 @@ static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data)
     }
 
     /*Simple sanity check*/
-    if(data->point.x < 0) LV_LOG_WARN("X is %d which is smaller than zero", data->point.x);
-    if(data->point.x >= lv_disp_get_hor_res(i->driver->disp)) LV_LOG_WARN("X is %d which is greater than hor. res",
-                                                                              data->point.x);
-    if(data->point.y < 0) LV_LOG_WARN("Y is %d which is smaller than zero", data->point.y);
-    if(data->point.y >= lv_disp_get_ver_res(i->driver->disp)) LV_LOG_WARN("Y is %d which is greater than hor. res",
-                                                                              data->point.y);
+    if(data->point.x < 0) {
+        LV_LOG_WARN("X is %d which is smaller than zero", data->point.x);
+    }
+    if(data->point.x >= lv_disp_get_hor_res(i->driver->disp)) {
+        LV_LOG_WARN("X is %d which is greater than hor. res", data->point.x);
+    }
+    if(data->point.y < 0) {
+        LV_LOG_WARN("Y is %d which is smaller than zero", data->point.y);
+    }
+    if(data->point.y >= lv_disp_get_ver_res(i->driver->disp)) {
+        LV_LOG_WARN("Y is %d which is greater than ver. res", data->point.y);
+    }
 
     /*Move the cursor if set and moved*/
     if(i->cursor != NULL &&
@@ -723,7 +724,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
 }
 
 /**
- * Process new points from a input device. indev->state.pressed has to be set
+ * Process new points from an input device. indev->state.pressed has to be set
  * @param indev pointer to an input device state
  * @param x x coordinate of the next point
  * @param y y coordinate of the next point
@@ -994,8 +995,7 @@ static void indev_click_focus(_lv_indev_proc_t * proc)
 {
     /*Handle click focus*/
     if(lv_obj_has_flag(indev_obj_act, LV_OBJ_FLAG_CLICK_FOCUSABLE) == false ||
-       proc->types.pointer.last_pressed == indev_obj_act)
-    {
+       proc->types.pointer.last_pressed == indev_obj_act) {
         return;
     }
 
@@ -1058,7 +1058,7 @@ static void indev_click_focus(_lv_indev_proc_t * proc)
 
 /**
 * Handle the gesture of indev_proc_p->types.pointer.act_obj
-* @param indev pointer to a input device state
+* @param indev pointer to an input device state
 */
 void indev_gesture(_lv_indev_proc_t * proc)
 {
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_indev.h b/lib/libesp32_lvgl/lvgl/src/core/lv_indev.h
index cd3f0e55b..80c793977 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_indev.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_indev.h
@@ -31,7 +31,7 @@ extern "C" {
 
 /**
  * Called periodically to read the input devices
- * @param param pointer to and input device to read
+ * @param timer pointer to a timer to read
  */
 void lv_indev_read_timer_cb(lv_timer_t * timer);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.c b/lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.c
index bf356a87b..96fa2f66d 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.c
@@ -100,7 +100,7 @@ void _lv_indev_scroll_throw_handler(_lv_indev_proc_t * proc)
 
 
     lv_indev_t * indev_act = lv_indev_get_act();
-    lv_coord_t scroll_throw =  indev_act->driver->scroll_throw;
+    lv_coord_t scroll_throw = indev_act->driver->scroll_throw;
 
     if(lv_obj_has_flag(scroll_obj, LV_OBJ_FLAG_SCROLL_MOMENTUM) == false) {
         proc->types.pointer.scroll_throw_vect.y = 0;
@@ -244,7 +244,7 @@ static lv_obj_t * find_scroll_obj(_lv_indev_proc_t * proc)
     lv_obj_t * obj_candidate = NULL;
     lv_dir_t dir_candidate = LV_DIR_NONE;
     lv_indev_t * indev_act = lv_indev_get_act();
-    lv_coord_t scroll_limit =  indev_act->driver->scroll_limit;
+    lv_coord_t scroll_limit = indev_act->driver->scroll_limit;
 
     /*Go until find a scrollable object in the current direction
      *More precisely:
@@ -254,24 +254,27 @@ static lv_obj_t * find_scroll_obj(_lv_indev_proc_t * proc)
      * 4. If can be scrolled on the current axis (hor/ver) save it as candidate (at least show an elastic scroll effect)
      * 5. Use the last candidate. Always the "deepest" parent or the object from point 3*/
     lv_obj_t * obj_act = proc->types.pointer.act_obj;
+
+    /*Decide if it's a horizontal or vertical scroll*/
+    bool hor_en = false;
+    bool ver_en = false;
+    if(LV_ABS(proc->types.pointer.scroll_sum.x) > LV_ABS(proc->types.pointer.scroll_sum.y)) {
+        hor_en = true;
+    }
+    else {
+        ver_en = true;
+    }
+
     while(obj_act) {
         if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLLABLE) == false) {
-            /*If this object don't want to chain the scroll ot the parent stop searching*/
-            if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLL_CHAIN) == false) break;
+            /*If this object don't want to chain the scroll to the parent stop searching*/
+            if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLL_CHAIN_HOR) == false && hor_en) break;
+            if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLL_CHAIN_VER) == false && ver_en) break;
+
             obj_act = lv_obj_get_parent(obj_act);
             continue;
         }
 
-        /*Decide if it's a horizontal or vertical scroll*/
-        bool hor_en = false;
-        bool ver_en = false;
-        if(LV_ABS(proc->types.pointer.scroll_sum.x) > LV_ABS(proc->types.pointer.scroll_sum.y)) {
-            hor_en = true;
-        }
-        else {
-            ver_en = true;
-        }
-
         /*Consider both up-down or left/right scrollable according to the current direction*/
         bool up_en = ver_en;
         bool down_en = ver_en;
@@ -296,14 +299,14 @@ static lv_obj_t * find_scroll_obj(_lv_indev_proc_t * proc)
          *is propagated to this object it can show at least elastic scroll effect.
          *But if not hor/ver scrollable do not scroll it at all (so it's not a good candidate)*/
         if((st > 0 || sb > 0)  &&
-           ((up_en    && proc->types.pointer.scroll_sum.y >= scroll_limit) ||
+           ((up_en    && proc->types.pointer.scroll_sum.y >=   scroll_limit) ||
             (down_en  && proc->types.pointer.scroll_sum.y <= - scroll_limit))) {
             obj_candidate = obj_act;
             dir_candidate = LV_DIR_VER;
         }
 
         if((sl > 0 || sr > 0)  &&
-           ((left_en    && proc->types.pointer.scroll_sum.x >=  scroll_limit) ||
+           ((left_en   && proc->types.pointer.scroll_sum.x >=   scroll_limit) ||
             (right_en  && proc->types.pointer.scroll_sum.x <= - scroll_limit))) {
             obj_candidate = obj_act;
             dir_candidate = LV_DIR_HOR;
@@ -323,8 +326,9 @@ static lv_obj_t * find_scroll_obj(_lv_indev_proc_t * proc)
             break;
         }
 
-        /*If this object don't want to chain the scroll ot the parent stop searching*/
-        if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLL_CHAIN) == false) break;
+        /*If this object don't want to chain the scroll to the parent stop searching*/
+        if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLL_CHAIN_HOR) == false && hor_en) break;
+        if(lv_obj_has_flag(obj_act, LV_OBJ_FLAG_SCROLL_CHAIN_VER) == false && ver_en) break;
 
         /*Try the parent*/
         obj_act = lv_obj_get_parent(obj_act);
@@ -537,11 +541,11 @@ static void scroll_limit_diff(_lv_indev_proc_t * proc, lv_coord_t * diff_x, lv_c
 
 static lv_coord_t scroll_throw_predict_y(_lv_indev_proc_t * proc)
 {
-    lv_coord_t y =  proc->types.pointer.scroll_throw_vect.y;
+    lv_coord_t y = proc->types.pointer.scroll_throw_vect.y;
     lv_coord_t move = 0;
 
     lv_indev_t * indev_act = lv_indev_get_act();
-    lv_coord_t scroll_throw =  indev_act->driver->scroll_throw;
+    lv_coord_t scroll_throw = indev_act->driver->scroll_throw;
 
     while(y) {
         move += y;
@@ -553,11 +557,11 @@ static lv_coord_t scroll_throw_predict_y(_lv_indev_proc_t * proc)
 
 static lv_coord_t scroll_throw_predict_x(_lv_indev_proc_t * proc)
 {
-    lv_coord_t x =  proc->types.pointer.scroll_throw_vect.x;
+    lv_coord_t x = proc->types.pointer.scroll_throw_vect.x;
     lv_coord_t move = 0;
 
     lv_indev_t * indev_act = lv_indev_get_act();
-    lv_coord_t scroll_throw =  indev_act->driver->scroll_throw;
+    lv_coord_t scroll_throw = indev_act->driver->scroll_throw;
 
     while(x) {
         move += x;
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj.c
index 8acf874d1..0b5f27a85 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #if LV_USE_GPU_STM32_DMA2D
-    #include "../gpu/lv_gpu_stm32_dma2d.h"
+    #include "../draw/stm32_dma2d/lv_gpu_stm32_dma2d.h"
 #endif
 
 #if LV_USE_GPU_NXP_PXP && LV_USE_GPU_NXP_PXP_AUTO_INIT
@@ -35,10 +35,6 @@
     #include "../gpu/lv_gpu_nxp_pxp_osa.h"
 #endif
 
-#if LV_USE_GPU_SDL
-    #include "../gpu/lv_gpu_sdl.h"
-#endif
-
 /*********************
  *      DEFINES
  *********************/
@@ -59,7 +55,7 @@ static void lv_obj_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_obj_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_obj_draw(lv_event_t * e);
 static void lv_obj_event(const lv_obj_class_t * class_p, lv_event_t * e);
-static void draw_scrollbar(lv_obj_t * obj, const lv_area_t * clip_area);
+static void draw_scrollbar(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
 static lv_res_t scrollbar_init_draw_dsc(lv_obj_t * obj, lv_draw_rect_dsc_t * dsc);
 static bool obj_valid_child(const lv_obj_t * parent, const lv_obj_t * obj_to_find);
 static void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state);
@@ -114,9 +110,11 @@ void lv_init(void)
 
     _lv_group_init();
 
+    lv_draw_init();
+
 #if LV_USE_GPU_STM32_DMA2D
     /*Initialize DMA2D GPU*/
-    lv_gpu_stm32_dma2d_init();
+    lv_draw_stm32_dma2d_init();
 #endif
 
 #if LV_USE_GPU_NXP_PXP && LV_USE_GPU_NXP_PXP_AUTO_INIT
@@ -125,9 +123,6 @@ void lv_init(void)
         for(; ;) ;
     }
 #endif
-#if LV_USE_GPU_SDL
-    lv_gpu_sdl_init();
-#endif
 
     _lv_obj_style_init();
     _lv_ll_init(&LV_GC_ROOT(_lv_disp_ll), sizeof(lv_disp_t));
@@ -145,7 +140,7 @@ void lv_init(void)
 
     uint8_t * txt_u8 = (uint8_t *)txt;
     if(txt_u8[0] != 0xc3 || txt_u8[1] != 0x81 || txt_u8[2] != 0x00) {
-        LV_LOG_WARN("The strings has no UTF-8 encoding. Non-ASCII characters won't be displayed.");
+        LV_LOG_WARN("The strings have no UTF-8 encoding. Non-ASCII characters won't be displayed.");
     }
 
     uint32_t endianess_test = 0x11223344;
@@ -174,7 +169,7 @@ void lv_init(void)
 #endif
 
 #if LV_LOG_LEVEL == LV_LOG_LEVEL_TRACE
-    LV_LOG_WARN("Log level is set the Trace which makes LVGL much slower");
+    LV_LOG_WARN("Log level is set to 'Trace' which makes LVGL much slower");
 #endif
 
     lv_extra_init();
@@ -184,13 +179,10 @@ void lv_init(void)
     LV_LOG_TRACE("finished");
 }
 
-#if LV_ENABLE_GC || !LV_MEM_CUSTOM || LV_USE_GPU_SDL
+#if LV_ENABLE_GC || !LV_MEM_CUSTOM
 
 void lv_deinit(void)
 {
-#if LV_USE_GPU_SDL
-    lv_gpu_sdl_deinit();
-#endif
     _lv_gc_clear_roots();
 
     lv_disp_set_default(NULL);
@@ -237,6 +229,7 @@ void lv_obj_add_flag(lv_obj_t * obj, lv_obj_flag_t f)
 
     if((was_on_layout != lv_obj_is_layout_positioned(obj)) || (f & (LV_OBJ_FLAG_LAYOUT_1 |  LV_OBJ_FLAG_LAYOUT_2))) {
         lv_obj_mark_layout_as_dirty(lv_obj_get_parent(obj));
+        lv_obj_mark_layout_as_dirty(obj);
     }
 
     if(f & LV_OBJ_FLAG_SCROLLABLE) {
@@ -265,6 +258,7 @@ void lv_obj_clear_flag(lv_obj_t * obj, lv_obj_flag_t f)
         lv_obj_invalidate(obj);
         if(lv_obj_is_layout_positioned(obj)) {
             lv_obj_mark_layout_as_dirty(lv_obj_get_parent(obj));
+            lv_obj_mark_layout_as_dirty(obj);
         }
     }
 
@@ -423,6 +417,7 @@ static void lv_obj_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
     obj->flags |= LV_OBJ_FLAG_SCROLLABLE;
     obj->flags |= LV_OBJ_FLAG_SCROLL_ELASTIC;
     obj->flags |= LV_OBJ_FLAG_SCROLL_MOMENTUM;
+    obj->flags |= LV_OBJ_FLAG_SCROLL_WITH_ARROW;
     if(parent) obj->flags |= LV_OBJ_FLAG_GESTURE_BUBBLE;
 
     LV_TRACE_OBJ_CREATE("finished");
@@ -509,7 +504,7 @@ static void lv_obj_draw(lv_event_t * e)
 
     }
     else if(code == LV_EVENT_DRAW_MAIN) {
-        const lv_area_t * clip_area = lv_event_get_param(e);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
         lv_draw_rect_dsc_t draw_dsc;
         lv_draw_rect_dsc_init(&draw_dsc);
         /*If the border is drawn later disable loading its properties*/
@@ -518,7 +513,6 @@ static void lv_obj_draw(lv_event_t * e)
         }
 
         lv_obj_init_draw_rect_dsc(obj, LV_PART_MAIN, &draw_dsc);
-
         lv_coord_t w = lv_obj_get_style_transform_width(obj, LV_PART_MAIN);
         lv_coord_t h = lv_obj_get_style_transform_height(obj, LV_PART_MAIN);
         lv_area_t coords;
@@ -529,7 +523,7 @@ static void lv_obj_draw(lv_event_t * e)
         coords.y2 += h;
 
         lv_obj_draw_part_dsc_t part_dsc;
-        lv_obj_draw_dsc_init(&part_dsc, clip_area);
+        lv_obj_draw_dsc_init(&part_dsc, draw_ctx);
         part_dsc.class_p = MY_CLASS;
         part_dsc.type = LV_OBJ_DRAW_PART_RECTANGLE;
         part_dsc.rect_dsc = &draw_dsc;
@@ -537,26 +531,42 @@ static void lv_obj_draw(lv_event_t * e)
         part_dsc.part = LV_PART_MAIN;
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_dsc);
 
-        lv_draw_rect(&coords, clip_area, &draw_dsc);
-
-        lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_dsc);
 
 #if LV_DRAW_COMPLEX
-        if(lv_obj_get_style_clip_corner(obj, LV_PART_MAIN)) {
-            /*If the radius is 0 the parent's coordinates will clip anyway*/
-            lv_coord_t r = lv_obj_get_style_radius(obj, LV_PART_MAIN);
-            if(r != 0) {
-                lv_draw_mask_radius_param_t * mp = lv_mem_buf_get(sizeof(lv_draw_mask_radius_param_t));
-                lv_draw_mask_radius_init(mp, &obj->coords, r, false);
-                /*Add the mask and use `obj+8` as custom id. Don't use `obj` directly because it might be used by the user*/
-                lv_draw_mask_add(mp, obj + 8);
-            }
+        /*With clip corner enabled draw the bg img separately to make it clipped*/
+        bool clip_corner = (lv_obj_get_style_clip_corner(obj, LV_PART_MAIN) && draw_dsc.radius != 0) ? true : false;
+        const void * bg_img_src = draw_dsc.bg_img_src;
+        if(clip_corner) {
+            draw_dsc.bg_img_src = NULL;
         }
 #endif
+
+        lv_draw_rect(draw_ctx, &draw_dsc, &coords);
+
+
+#if LV_DRAW_COMPLEX
+        if(clip_corner) {
+            lv_draw_mask_radius_param_t * mp = lv_mem_buf_get(sizeof(lv_draw_mask_radius_param_t));
+            lv_draw_mask_radius_init(mp, &obj->coords, draw_dsc.radius, false);
+            /*Add the mask and use `obj+8` as custom id. Don't use `obj` directly because it might be used by the user*/
+            lv_draw_mask_add(mp, obj + 8);
+
+            if(bg_img_src) {
+                draw_dsc.bg_opa = LV_OPA_TRANSP;
+                draw_dsc.border_opa = LV_OPA_TRANSP;
+                draw_dsc.outline_opa = LV_OPA_TRANSP;
+                draw_dsc.shadow_opa = LV_OPA_TRANSP;
+                draw_dsc.bg_img_src = bg_img_src;
+                lv_draw_rect(draw_ctx, &draw_dsc, &coords);
+            }
+
+        }
+#endif
+        lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_dsc);
     }
     else if(code == LV_EVENT_DRAW_POST) {
-        const lv_area_t * clip_area = lv_event_get_param(e);
-        draw_scrollbar(obj, clip_area);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
+        draw_scrollbar(obj, draw_ctx);
 
 #if LV_DRAW_COMPLEX
         if(lv_obj_get_style_clip_corner(obj, LV_PART_MAIN)) {
@@ -573,9 +583,9 @@ static void lv_obj_draw(lv_event_t * e)
             lv_draw_rect_dsc_t draw_dsc;
             lv_draw_rect_dsc_init(&draw_dsc);
             draw_dsc.bg_opa = LV_OPA_TRANSP;
+            draw_dsc.bg_img_opa = LV_OPA_TRANSP;
             draw_dsc.outline_opa = LV_OPA_TRANSP;
             draw_dsc.shadow_opa = LV_OPA_TRANSP;
-            draw_dsc.bg_img_opa = LV_OPA_TRANSP;
             lv_obj_init_draw_rect_dsc(obj, LV_PART_MAIN, &draw_dsc);
 
             lv_coord_t w = lv_obj_get_style_transform_width(obj, LV_PART_MAIN);
@@ -588,7 +598,7 @@ static void lv_obj_draw(lv_event_t * e)
             coords.y2 += h;
 
             lv_obj_draw_part_dsc_t part_dsc;
-            lv_obj_draw_dsc_init(&part_dsc, clip_area);
+            lv_obj_draw_dsc_init(&part_dsc, draw_ctx);
             part_dsc.class_p = MY_CLASS;
             part_dsc.type = LV_OBJ_DRAW_PART_BORDER_POST;
             part_dsc.rect_dsc = &draw_dsc;
@@ -596,13 +606,13 @@ static void lv_obj_draw(lv_event_t * e)
             part_dsc.part = LV_PART_MAIN;
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_dsc);
 
-            lv_draw_rect(&coords, clip_area, &draw_dsc);
+            lv_draw_rect(draw_ctx, &draw_dsc, &coords);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_dsc);
         }
     }
 }
 
-static void draw_scrollbar(lv_obj_t * obj, const lv_area_t * clip_area)
+static void draw_scrollbar(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
 
     lv_area_t hor_area;
@@ -616,7 +626,7 @@ static void draw_scrollbar(lv_obj_t * obj, const lv_area_t * clip_area)
     if(sb_res != LV_RES_OK) return;
 
     lv_obj_draw_part_dsc_t part_dsc;
-    lv_obj_draw_dsc_init(&part_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_dsc, draw_ctx);
     part_dsc.class_p = MY_CLASS;
     part_dsc.type = LV_OBJ_DRAW_PART_SCROLLBAR;
     part_dsc.rect_dsc = &draw_dsc;
@@ -625,13 +635,14 @@ static void draw_scrollbar(lv_obj_t * obj, const lv_area_t * clip_area)
     if(lv_area_get_size(&hor_area) > 0) {
         part_dsc.draw_area = &hor_area;
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_dsc);
-        lv_draw_rect(&hor_area, clip_area, &draw_dsc);
+        lv_draw_rect(draw_ctx, &draw_dsc, &hor_area);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_dsc);
     }
     if(lv_area_get_size(&ver_area) > 0) {
         part_dsc.draw_area = &ver_area;
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_dsc);
-        lv_draw_rect(&ver_area, clip_area, &draw_dsc);
+        part_dsc.draw_area = &ver_area;
+        lv_draw_rect(draw_ctx, &draw_dsc, &ver_area);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_dsc);
     }
 }
@@ -699,7 +710,7 @@ static void lv_obj_event(const lv_obj_class_t * class_p, lv_event_t * e)
     LV_UNUSED(class_p);
 
     lv_event_code_t code = lv_event_get_code(e);
-    lv_obj_t * obj = lv_event_get_target(e);
+    lv_obj_t * obj = lv_event_get_current_target(e);
     if(code == LV_EVENT_PRESSED) {
         lv_obj_add_state(obj, LV_STATE_PRESSED);
     }
@@ -741,7 +752,7 @@ static void lv_obj_event(const lv_obj_class_t * class_p, lv_event_t * e)
                 if(res != LV_RES_OK) return;
             }
         }
-        else if(lv_obj_has_flag(obj, LV_OBJ_FLAG_SCROLLABLE) && !lv_obj_is_editable(obj)) {
+        else if(lv_obj_has_flag(obj, LV_OBJ_FLAG_SCROLLABLE | LV_OBJ_FLAG_SCROLL_WITH_ARROW) && !lv_obj_is_editable(obj)) {
             /*scroll by keypad or encoder*/
             lv_anim_enable_t anim_enable = LV_ANIM_OFF;
             lv_coord_t sl = lv_obj_get_scroll_left(obj);
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj.h
index c92ffde8f..7bd89c8a4 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj.h
@@ -95,15 +95,19 @@ enum {
     LV_OBJ_FLAG_SCROLL_ELASTIC  = (1L << 5),  /**< Allow scrolling inside but with slower speed*/
     LV_OBJ_FLAG_SCROLL_MOMENTUM = (1L << 6),  /**< Make the object scroll further when "thrown"*/
     LV_OBJ_FLAG_SCROLL_ONE      = (1L << 7),  /**< Allow scrolling only one snappable children*/
-    LV_OBJ_FLAG_SCROLL_CHAIN    = (1L << 8),  /**< Allow propagating the scroll to a parent*/
-    LV_OBJ_FLAG_SCROLL_ON_FOCUS = (1L << 9),  /**< Automatically scroll object to make it visible when focused*/
-    LV_OBJ_FLAG_SNAPPABLE       = (1L << 10), /**< If scroll snap is enabled on the parent it can snap to this object*/
-    LV_OBJ_FLAG_PRESS_LOCK      = (1L << 11), /**< Keep the object pressed even if the press slid from the object*/
-    LV_OBJ_FLAG_EVENT_BUBBLE    = (1L << 12), /**< Propagate the events to the parent too*/
-    LV_OBJ_FLAG_GESTURE_BUBBLE  = (1L << 13), /**< Propagate the gestures to the parent*/
-    LV_OBJ_FLAG_ADV_HITTEST     = (1L << 14), /**< Allow performing more accurate hit (click) test. E.g. consider rounded corners.*/
-    LV_OBJ_FLAG_IGNORE_LAYOUT   = (1L << 15), /**< Make the object position-able by the layouts*/
-    LV_OBJ_FLAG_FLOATING        = (1L << 16), /**< Do not scroll the object when the parent scrolls and ignore layout*/
+    LV_OBJ_FLAG_SCROLL_CHAIN_HOR = (1L << 8), /**< Allow propagating the horizontal scroll to a parent*/
+    LV_OBJ_FLAG_SCROLL_CHAIN_VER = (1L << 9), /**< Allow propagating the vertical scroll to a parent*/
+    LV_OBJ_FLAG_SCROLL_CHAIN     = (LV_OBJ_FLAG_SCROLL_CHAIN_HOR | LV_OBJ_FLAG_SCROLL_CHAIN_VER),
+    LV_OBJ_FLAG_SCROLL_ON_FOCUS = (1L << 10),  /**< Automatically scroll object to make it visible when focused*/
+    LV_OBJ_FLAG_SCROLL_WITH_ARROW  = (1L << 11), /**< Allow scrolling the focused object with arrow keys*/
+    LV_OBJ_FLAG_SNAPPABLE       = (1L << 12), /**< If scroll snap is enabled on the parent it can snap to this object*/
+    LV_OBJ_FLAG_PRESS_LOCK      = (1L << 13), /**< Keep the object pressed even if the press slid from the object*/
+    LV_OBJ_FLAG_EVENT_BUBBLE    = (1L << 14), /**< Propagate the events to the parent too*/
+    LV_OBJ_FLAG_GESTURE_BUBBLE  = (1L << 15), /**< Propagate the gestures to the parent*/
+    LV_OBJ_FLAG_ADV_HITTEST     = (1L << 16), /**< Allow performing more accurate hit (click) test. E.g. consider rounded corners.*/
+    LV_OBJ_FLAG_IGNORE_LAYOUT   = (1L << 17), /**< Make the object position-able by the layouts*/
+    LV_OBJ_FLAG_FLOATING        = (1L << 18), /**< Do not scroll the object when the parent scrolls and ignore layout*/
+    LV_OBJ_FLAG_OVERFLOW_VISIBLE = (1L << 19), /**< Do not clip the children's content to the parent's boundary*/
 
     LV_OBJ_FLAG_LAYOUT_1        = (1L << 23), /**< Custom flag, free to use by layouts*/
     LV_OBJ_FLAG_LAYOUT_2        = (1L << 24), /**< Custom flag, free to use by layouts*/
@@ -114,7 +118,10 @@ enum {
     LV_OBJ_FLAG_USER_2          = (1L << 28), /**< Custom flag, free to use by user*/
     LV_OBJ_FLAG_USER_3          = (1L << 29), /**< Custom flag, free to use by user*/
     LV_OBJ_FLAG_USER_4          = (1L << 30), /**< Custom flag, free to use by user*/
+
 };
+
+
 typedef uint32_t lv_obj_flag_t;
 
 /**
@@ -193,7 +200,7 @@ typedef struct _lv_obj_t {
  */
 void lv_init(void);
 
-#if LV_ENABLE_GC || !LV_MEM_CUSTOM || LV_USE_GPU_SDL
+#if LV_ENABLE_GC || !LV_MEM_CUSTOM
 
 /**
  * Deinit the 'lv' library
@@ -377,13 +384,14 @@ static inline lv_coord_t lv_obj_dpx(const lv_obj_t * obj, lv_coord_t n)
  **********************/
 
 #if LV_USE_ASSERT_OBJ
-#  define LV_ASSERT_OBJ(obj_p, obj_class)                                    \
-    LV_ASSERT_MSG(obj_p != NULL, "The object is NULL");               \
-    LV_ASSERT_MSG(lv_obj_has_class(obj_p, obj_class) == true, "Incompatible object type."); \
-    LV_ASSERT_MSG(lv_obj_is_valid(obj_p)  == true, "The object is invalid, deleted or corrupted?");
-
+#  define LV_ASSERT_OBJ(obj_p, obj_class)                                                               \
+    do {                                                                                                \
+        LV_ASSERT_MSG(obj_p != NULL, "The object is NULL");                                             \
+        LV_ASSERT_MSG(lv_obj_has_class(obj_p, obj_class) == true, "Incompatible object type.");         \
+        LV_ASSERT_MSG(lv_obj_is_valid(obj_p)  == true, "The object is invalid, deleted or corrupted?"); \
+    } while(0)
 # else
-# define LV_ASSERT_OBJ(obj_p, obj_class) do{}while(0)
+#  define LV_ASSERT_OBJ(obj_p, obj_class) do{}while(0)
 #endif
 
 #if LV_USE_LOG && LV_LOG_TRACE_OBJ_CREATE
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.c
index 40538e0f1..174453e98 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.c
@@ -55,7 +55,7 @@ lv_obj_t * lv_obj_class_create_obj(const lv_obj_class_t * class_p, lv_obj_t * pa
         LV_TRACE_OBJ_CREATE("creating a screen");
         lv_disp_t * disp = lv_disp_get_default();
         if(!disp) {
-            LV_LOG_WARN("No display created to so far. No place to assign the new screen");
+            LV_LOG_WARN("No display created yet. No place to assign the new screen");
             return NULL;
         }
 
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.c
index 411135f30..db7c6ea54 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.c
@@ -58,11 +58,19 @@ void lv_obj_init_draw_rect_dsc(lv_obj_t * obj, uint32_t part, lv_draw_rect_dsc_t
         draw_dsc->bg_opa = lv_obj_get_style_bg_opa(obj, part);
         if(draw_dsc->bg_opa > LV_OPA_MIN) {
             draw_dsc->bg_color = lv_obj_get_style_bg_color_filtered(obj, part);
-            draw_dsc->bg_grad_dir =  lv_obj_get_style_bg_grad_dir(obj, part);
-            if(draw_dsc->bg_grad_dir != LV_GRAD_DIR_NONE) {
-                draw_dsc->bg_grad_color = lv_obj_get_style_bg_grad_color_filtered(obj, part);
-                draw_dsc->bg_main_color_stop =  lv_obj_get_style_bg_main_stop(obj, part);
-                draw_dsc->bg_grad_color_stop =  lv_obj_get_style_bg_grad_stop(obj, part);
+            const lv_grad_dsc_t * grad = lv_obj_get_style_bg_grad(obj, part);
+            if(grad && grad->dir != LV_GRAD_DIR_NONE) {
+                lv_memcpy(&draw_dsc->bg_grad, grad, sizeof(*grad));
+            }
+            else {
+                draw_dsc->bg_grad.dir = lv_obj_get_style_bg_grad_dir(obj, part);
+                if(draw_dsc->bg_grad.dir != LV_GRAD_DIR_NONE) {
+                    draw_dsc->bg_grad.stops[0].color = lv_obj_get_style_bg_color_filtered(obj, part);
+                    draw_dsc->bg_grad.stops[1].color = lv_obj_get_style_bg_grad_color_filtered(obj, part);
+                    draw_dsc->bg_grad.stops[0].frac = lv_obj_get_style_bg_main_stop(obj, part);
+                    draw_dsc->bg_grad.stops[1].frac = lv_obj_get_style_bg_grad_stop(obj, part);
+                }
+                draw_dsc->bg_grad.dither = lv_obj_get_style_bg_dither_mode(obj, part);
             }
         }
     }
@@ -128,6 +136,7 @@ void lv_obj_init_draw_rect_dsc(lv_obj_t * obj, uint32_t part, lv_draw_rect_dsc_t
 
     if(opa < LV_OPA_MAX) {
         draw_dsc->bg_opa = (uint16_t)((uint16_t)draw_dsc->bg_opa * opa) >> 8;
+        draw_dsc->bg_img_opa = (uint16_t)((uint16_t)draw_dsc->bg_img_opa * opa) >> 8;
         draw_dsc->border_opa = (uint16_t)((uint16_t)draw_dsc->border_opa * opa) >> 8;
         draw_dsc->shadow_opa = (uint16_t)((uint16_t)draw_dsc->shadow_opa * opa) >> 8;
         draw_dsc->outline_opa = (uint16_t)((uint16_t)draw_dsc->outline_opa * opa) >> 8;
@@ -322,10 +331,10 @@ lv_coord_t lv_obj_calculate_ext_draw_size(lv_obj_t * obj, uint32_t part)
     return s;
 }
 
-void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, const lv_area_t * clip_area)
+void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, lv_draw_ctx_t * draw_ctx)
 {
     lv_memset_00(dsc, sizeof(lv_obj_draw_part_dsc_t));
-    dsc->clip_area = clip_area;
+    dsc->draw_ctx = draw_ctx;
 }
 
 bool lv_obj_draw_part_check_type(lv_obj_draw_part_dsc_t * dsc, const lv_obj_class_t * class_p, uint32_t type)
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.h
index 1a9e2e5c5..063216540 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.h
@@ -34,7 +34,7 @@ typedef enum {
 } lv_cover_res_t;
 
 typedef struct {
-    const lv_area_t * clip_area;        /**< The current clip area, required if you need to draw something in the event*/
+    lv_draw_ctx_t * draw_ctx;           /**< Draw context*/
     const struct _lv_obj_class_t * class_p;     /**< The class that sent the event */
     uint32_t type;                      /**< The type if part being draw. Element of `lv_<name>_draw_part_type_t` */
     lv_area_t * draw_area;              /**< The area of the part being drawn*/
@@ -125,9 +125,9 @@ lv_coord_t lv_obj_calculate_ext_draw_size(struct _lv_obj_t * obj, uint32_t part)
 /**
  * Initialize a draw descriptor used in events.
  * @param dsc pointer to a descriptor. Later it should be passed as parameter to an `LV_EEVNT_DRAW_PART_BEGIN/END` event.
- * @param clip_area the current clip area of the drawing
+ * @param draw the current draw context. (usually returned by `lv_event_get_draw_ctx(e)`)
  */
-void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, const lv_area_t * clip_area);
+void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, lv_draw_ctx_t * draw_ctx);
 
 /**
  * Check the type obj a part draw descriptor
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.c
index 4a8f23459..92d4bc4d9 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.c
@@ -202,7 +202,7 @@ bool lv_obj_refr_size(lv_obj_t * obj)
     lv_obj_readjust_scroll(obj, LV_ANIM_OFF);
 
     /*If the object was out of the parent invalidate the new scrollbar area too.
-     *If it wasn't out of the parent but out now, also invalidate the srollbars*/
+     *If it wasn't out of the parent but out now, also invalidate the scrollbars*/
     bool on2 = _lv_area_is_in(&obj->coords, &parent_fit_area, 0);
     if(on1 || (!on1 && on2)) lv_obj_scrollbar_invalidate(parent);
 
@@ -292,7 +292,7 @@ void lv_obj_mark_layout_as_dirty(lv_obj_t * obj)
 
     /*Make the display refreshing*/
     lv_disp_t * disp = lv_obj_get_disp(scr);
-    lv_timer_resume(disp->refr_timer);
+    if(disp->refr_timer) lv_timer_resume(disp->refr_timer);
 }
 
 void lv_obj_update_layout(const lv_obj_t * obj)
@@ -538,6 +538,17 @@ lv_coord_t lv_obj_get_y2(const lv_obj_t * obj)
     return lv_obj_get_y(obj) + lv_obj_get_height(obj);
 }
 
+lv_coord_t lv_obj_get_x_aligned(const lv_obj_t * obj)
+{
+    return lv_obj_get_style_x(obj, LV_PART_MAIN);
+}
+
+lv_coord_t lv_obj_get_y_aligned(const lv_obj_t * obj)
+{
+    return lv_obj_get_style_y(obj, LV_PART_MAIN);
+}
+
+
 lv_coord_t lv_obj_get_width(const lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -568,7 +579,7 @@ lv_coord_t lv_obj_get_content_height(const lv_obj_t * obj)
     LV_ASSERT_OBJ(obj, MY_CLASS);
 
     lv_coord_t top = lv_obj_get_style_pad_top(obj, LV_PART_MAIN);
-    lv_coord_t bottom =  lv_obj_get_style_pad_bottom(obj, LV_PART_MAIN);
+    lv_coord_t bottom = lv_obj_get_style_pad_bottom(obj, LV_PART_MAIN);
     lv_coord_t border_width = lv_obj_get_style_border_width(obj, LV_PART_MAIN);
 
     return lv_obj_get_height(obj) - top - bottom - 2 * border_width;
@@ -796,6 +807,12 @@ void lv_obj_invalidate(const lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
 
+    /*If the object has overflow visible it can be drawn anywhere on its parent
+     *It needs to be checked recursively*/
+    while(lv_obj_get_parent(obj) && lv_obj_has_flag(obj, LV_OBJ_FLAG_OVERFLOW_VISIBLE)) {
+        obj = lv_obj_get_parent(obj);
+    }
+
     /*Truncate the area to the object*/
     lv_area_t obj_coords;
     lv_coord_t ext_size = _lv_obj_get_ext_draw_size(obj);
@@ -813,7 +830,7 @@ bool lv_obj_area_is_visible(const lv_obj_t * obj, lv_area_t * area)
 {
     if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return false;
 
-    /*Invalidate the object only if it belongs to the current or previous'*/
+    /*Invalidate the object only if it belongs to the current or previous or one of the layers'*/
     lv_obj_t * obj_scr = lv_obj_get_screen(obj);
     lv_disp_t * disp   = lv_obj_get_disp(obj_scr);
     if(obj_scr != lv_disp_get_scr_act(disp) &&
@@ -824,26 +841,29 @@ bool lv_obj_area_is_visible(const lv_obj_t * obj, lv_area_t * area)
     }
 
     /*Truncate the area to the object*/
-    lv_area_t obj_coords;
-    lv_coord_t ext_size = _lv_obj_get_ext_draw_size(obj);
-    lv_area_copy(&obj_coords, &obj->coords);
-    obj_coords.x1 -= ext_size;
-    obj_coords.y1 -= ext_size;
-    obj_coords.x2 += ext_size;
-    obj_coords.y2 += ext_size;
+    if(!lv_obj_has_flag(obj, LV_OBJ_FLAG_OVERFLOW_VISIBLE)) {
+        lv_area_t obj_coords;
+        lv_coord_t ext_size = _lv_obj_get_ext_draw_size(obj);
+        lv_area_copy(&obj_coords, &obj->coords);
+        obj_coords.x1 -= ext_size;
+        obj_coords.y1 -= ext_size;
+        obj_coords.x2 += ext_size;
+        obj_coords.y2 += ext_size;
 
-    bool is_common;
-
-    is_common = _lv_area_intersect(area, area, &obj_coords);
-    if(is_common == false) return false;  /*The area is not on the object*/
+        /*The area is not on the object*/
+        if(!_lv_area_intersect(area, area, &obj_coords)) return false;
+    }
 
     /*Truncate recursively to the parents*/
     lv_obj_t * par = lv_obj_get_parent(obj);
     while(par != NULL) {
-        is_common = _lv_area_intersect(area, area, &par->coords);
-        if(is_common == false) return false;       /*If no common parts with parent break;*/
-        if(lv_obj_has_flag(par, LV_OBJ_FLAG_HIDDEN)) return
-                false; /*If the parent is hidden then the child is hidden and won't be drawn*/
+        /*If the parent is hidden then the child is hidden and won't be drawn*/
+        if(lv_obj_has_flag(par, LV_OBJ_FLAG_HIDDEN)) return false;
+
+        /*Truncate to the parent and if no common parts break*/
+        if(!lv_obj_has_flag(par, LV_OBJ_FLAG_OVERFLOW_VISIBLE)) {
+            if(!_lv_area_intersect(area, area, &par->coords)) return false;
+        }
 
         par = lv_obj_get_parent(par);
     }
@@ -888,6 +908,9 @@ void lv_obj_get_click_area(const lv_obj_t * obj, lv_area_t * area)
 
 bool lv_obj_hit_test(lv_obj_t * obj, const lv_point_t * point)
 {
+    if(!lv_obj_has_flag(obj, LV_OBJ_FLAG_CLICKABLE)) return false;
+    if(lv_obj_has_state(obj, LV_STATE_DISABLED)) return false;
+
     lv_area_t a;
     lv_obj_get_click_area(obj, &a);
     bool res = _lv_area_is_point_on(&a, point, 0);
@@ -955,13 +978,14 @@ static lv_coord_t calc_content_width(lv_obj_t * obj)
                         child_res = LV_MAX(child_res, obj->coords.x2 - child->coords.x1 + 1);
                         break;
                     default:
-                    	/* Consider other cases only if x=0 and use the width of the object.
-                    	 * With x!=0 circular dependency could occur. */
-                    	if(lv_obj_get_style_y(child, 0) == 0) {
-                    		child_res = LV_MAX(child_res, lv_area_get_width(&child->coords));
-                    	}
+                        /* Consider other cases only if x=0 and use the width of the object.
+                         * With x!=0 circular dependency could occur. */
+                        if(lv_obj_get_style_x(child, 0) == 0) {
+                            child_res = LV_MAX(child_res, lv_area_get_width(&child->coords) + pad_right);
+                        }
                 }
-            } else {
+            }
+            else {
                 child_res = LV_MAX(child_res, obj->coords.x2 - child->coords.x1 + 1);
             }
         }
@@ -986,13 +1010,14 @@ static lv_coord_t calc_content_width(lv_obj_t * obj)
                         child_res = LV_MAX(child_res, child->coords.x2 - obj->coords.x1 + 1);
                         break;
                     default:
-                    	/* Consider other cases only if x=0 and use the width of the object.
-                    	 * With x!=0 circular dependency could occur. */
-                    	if(lv_obj_get_style_y(child, 0) == 0) {
-                    		child_res = LV_MAX(child_res, lv_area_get_width(&child->coords));
-                    	}
+                        /* Consider other cases only if x=0 and use the width of the object.
+                         * With x!=0 circular dependency could occur. */
+                        if(lv_obj_get_style_y(child, 0) == 0) {
+                            child_res = LV_MAX(child_res, lv_area_get_width(&child->coords) + pad_left);
+                        }
                 }
-            } else {
+            }
+            else {
                 child_res = LV_MAX(child_res, child->coords.x2 - obj->coords.x1 + 1);
             }
         }
@@ -1036,14 +1061,15 @@ static lv_coord_t calc_content_height(lv_obj_t * obj)
                     child_res = LV_MAX(child_res, child->coords.y2 - obj->coords.y1 + 1);
                     break;
                 default:
-                	/* Consider other cases only if y=0 and use the height of the object.
-                	 * With y!=0 circular dependency could occur. */
-                	if(lv_obj_get_style_y(child, 0) == 0) {
-                		child_res = LV_MAX(child_res, lv_area_get_height(&child->coords));
-                	}
-                	break;
+                    /* Consider other cases only if y=0 and use the height of the object.
+                     * With y!=0 circular dependency could occur. */
+                    if(lv_obj_get_style_y(child, 0) == 0) {
+                        child_res = LV_MAX(child_res, lv_area_get_height(&child->coords) + pad_top);
+                    }
+                    break;
             }
-        } else {
+        }
+        else {
             child_res = LV_MAX(child_res, child->coords.y2 - obj->coords.y1 + 1);
         }
     }
@@ -1051,7 +1077,8 @@ static lv_coord_t calc_content_height(lv_obj_t * obj)
     if(child_res != LV_COORD_MIN) {
         child_res += pad_bottom;
         return LV_MAX(child_res, self_h);
-    } else {
+    }
+    else {
         return self_h;
     }
 
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.h
index c73159ffd..60130398e 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.h
@@ -35,24 +35,36 @@ typedef struct {
  **********************/
 
 /**
- * Set the relative the position of an object (relative to the parent's top left corner)
+ * Set the position of an object relative to the set alignment.
  * @param obj       pointer to an object
- * @param x         new distance from the left side of the parent plus the parent's left padding
- * @param y         new distance from the top side of the parent  plus the parent's right padding
+ * @param x         new x coordinate
+ * @param y         new y coordinate
+ * @note            With default alignment it's the distance from the top left corner
+ * @note            E.g. LV_ALIGN_CENTER alignment it's the offset from the center of the parent
+ * @note            The position is interpreted on the content area of the parent
+ * @note            The values can be set in pixel or in percentage of parent size with `lv_pct(v)`
  */
 void lv_obj_set_pos(struct _lv_obj_t * obj, lv_coord_t x, lv_coord_t y);
 
 /**
- * Set the x coordinate of a object
+ * Set the x coordinate of an object
  * @param obj       pointer to an object
- * @param x         new distance from the left side from the parent plus the parent's left padding
+ * @param x         new x coordinate
+ * @note            With default alignment it's the distance from the top left corner
+ * @note            E.g. LV_ALIGN_CENTER alignment it's the offset from the center of the parent
+ * @note            The position is interpreted on the content area of the parent
+ * @note            The values can be set in pixel or in percentage of parent size with `lv_pct(v)`
  */
 void lv_obj_set_x(struct _lv_obj_t * obj, lv_coord_t x);
 
 /**
- * Set the y coordinate of a object
+ * Set the y coordinate of an object
  * @param obj       pointer to an object
- * @param y         new distance from the top of the parent  plus the parent's top padding
+ * @param y         new y coordinate
+ * @note            With default alignment it's the distance from the top left corner
+ * @note            E.g. LV_ALIGN_CENTER alignment it's the offset from the center of the parent
+ * @note            The position is interpreted on the content area of the parent
+ * @note            The values can be set in pixel or in percentage of parent size with `lv_pct(v)`
  */
 void lv_obj_set_y(struct _lv_obj_t * obj, lv_coord_t y);
 
@@ -141,7 +153,7 @@ void lv_obj_mark_layout_as_dirty(struct _lv_obj_t * obj);
 void lv_obj_update_layout(const struct _lv_obj_t * obj);
 
 /**
- * Regsiter a new layout
+ * Register a new layout
  * @param cb        the layout update callback
  * @param user_data custom data that will be passed to `cb`
  * @return          the ID of the new layout
@@ -245,6 +257,20 @@ lv_coord_t lv_obj_get_y(const struct _lv_obj_t * obj);
  */
 lv_coord_t lv_obj_get_y2(const struct _lv_obj_t * obj);
 
+/**
+ * Get the actually set x coordinate of object, i.e. the offset form the set alignment
+ * @param obj       pointer to an object
+ * @return          the set x coordinate
+ */
+lv_coord_t lv_obj_get_x_aligned(const struct _lv_obj_t * obj);
+
+/**
+ * Get the actually set y coordinate of object, i.e. the offset form the set alignment
+ * @param obj       pointer to an object
+ * @return          the set y coordinate
+ */
+lv_coord_t lv_obj_get_y_aligned(const struct _lv_obj_t * obj);
+
 /**
  * Get the width of an object
  * @param obj       pointer to an object
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.c
index 0b2a5d26e..6927acace 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.c
@@ -252,9 +252,58 @@ void lv_obj_get_scroll_end(struct _lv_obj_t  * obj, lv_point_t * end)
  * Other functions
  *====================*/
 
-void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable_t anim_en)
+void lv_obj_scroll_by_bounded(lv_obj_t * obj, lv_coord_t dx, lv_coord_t dy, lv_anim_enable_t anim_en)
 {
-    if(x == 0 && y == 0) return;
+    if(dx == 0 && dy == 0) return;
+
+    /*We need to know the final sizes for bound check*/
+    lv_obj_update_layout(obj);
+
+    /*Don't let scroll more then naturally possible by the size of the content*/
+    lv_coord_t x_current = -lv_obj_get_scroll_x(obj);
+    lv_coord_t x_bounded = x_current + dx;
+
+    if(lv_obj_get_style_base_dir(obj, LV_PART_MAIN) != LV_BASE_DIR_RTL) {
+        if(x_bounded > 0) x_bounded = 0;
+        if(x_bounded < 0) {
+            lv_coord_t  scroll_max = lv_obj_get_scroll_left(obj) + lv_obj_get_scroll_right(obj);
+            if(scroll_max < 0) scroll_max = 0;
+
+            if(x_bounded < -scroll_max) x_bounded = -scroll_max;
+        }
+    }
+    else {
+        if(x_bounded < 0) x_bounded = 0;
+        if(x_bounded > 0) {
+            lv_coord_t  scroll_max = lv_obj_get_scroll_left(obj) + lv_obj_get_scroll_right(obj);
+            if(scroll_max < 0) scroll_max = 0;
+
+            if(x_bounded > scroll_max) x_bounded = scroll_max;
+        }
+    }
+
+    /*Don't let scroll more then naturally possible by the size of the content*/
+    lv_coord_t y_current = -lv_obj_get_scroll_y(obj);
+    lv_coord_t y_bounded = y_current + dy;
+
+    if(y_bounded > 0) y_bounded = 0;
+    if(y_bounded < 0) {
+        lv_coord_t  scroll_max = lv_obj_get_scroll_top(obj) + lv_obj_get_scroll_bottom(obj);
+        if(scroll_max < 0) scroll_max = 0;
+        if(y_bounded < -scroll_max) y_bounded = -scroll_max;
+    }
+
+    dx = x_bounded - x_current;
+    dy = y_bounded - y_current;
+    if(dx || dy) {
+        lv_obj_scroll_by(obj, dx, dy, anim_en);
+    }
+}
+
+
+void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t dx, lv_coord_t dy, lv_anim_enable_t anim_en)
+{
+    if(dx == 0 && dy == 0) return;
     if(anim_en == LV_ANIM_ON) {
         lv_disp_t * d = lv_obj_get_disp(obj);
         lv_anim_t a;
@@ -262,13 +311,13 @@ void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable
         lv_anim_set_var(&a, obj);
         lv_anim_set_ready_cb(&a, scroll_anim_ready_cb);
 
-        if(x) {
-            uint32_t t = lv_anim_speed_to_time((lv_disp_get_hor_res(d) * 2) >> 2, 0, x);
+        if(dx) {
+            uint32_t t = lv_anim_speed_to_time((lv_disp_get_hor_res(d) * 2) >> 2, 0, dx);
             if(t < SCROLL_ANIM_TIME_MIN) t = SCROLL_ANIM_TIME_MIN;
             if(t > SCROLL_ANIM_TIME_MAX) t = SCROLL_ANIM_TIME_MAX;
             lv_anim_set_time(&a, t);
             lv_coord_t sx = lv_obj_get_scroll_x(obj);
-            lv_anim_set_values(&a, -sx, -sx + x);
+            lv_anim_set_values(&a, -sx, -sx + dx);
             lv_anim_set_exec_cb(&a, scroll_x_anim);
             lv_anim_set_path_cb(&a, lv_anim_path_ease_out);
 
@@ -278,13 +327,13 @@ void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable
             lv_anim_start(&a);
         }
 
-        if(y) {
-            uint32_t t = lv_anim_speed_to_time((lv_disp_get_ver_res(d) * 2) >> 2, 0, y);
+        if(dy) {
+            uint32_t t = lv_anim_speed_to_time((lv_disp_get_ver_res(d) * 2) >> 2, 0, dy);
             if(t < SCROLL_ANIM_TIME_MIN) t = SCROLL_ANIM_TIME_MIN;
             if(t > SCROLL_ANIM_TIME_MAX) t = SCROLL_ANIM_TIME_MAX;
             lv_anim_set_time(&a, t);
             lv_coord_t sy = lv_obj_get_scroll_y(obj);
-            lv_anim_set_values(&a, -sy, -sy + y);
+            lv_anim_set_values(&a, -sy, -sy + dy);
             lv_anim_set_exec_cb(&a,  scroll_y_anim);
             lv_anim_set_path_cb(&a, lv_anim_path_ease_out);
 
@@ -298,7 +347,7 @@ void lv_obj_scroll_by(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable
         /*Remove pending animations*/
         bool y_del = lv_anim_del(obj, scroll_y_anim);
         bool x_del = lv_anim_del(obj, scroll_x_anim);
-        scroll_by_raw(obj, x, y);
+        scroll_by_raw(obj, dx, dy);
         if(y_del || x_del) {
             lv_res_t res;
             res = lv_event_send(obj, LV_EVENT_SCROLL_END, NULL);
@@ -317,48 +366,20 @@ void lv_obj_scroll_to_x(lv_obj_t * obj, lv_coord_t x, lv_anim_enable_t anim_en)
 {
     lv_anim_del(obj, scroll_x_anim);
 
-    /*Don't let scroll more then naturally possible by the size of the content*/
-    if(lv_obj_get_style_base_dir(obj, LV_PART_MAIN) != LV_BASE_DIR_RTL) {
-        if(x < 0) x = 0;
-        if(x > 0) {
-            lv_coord_t  scroll_max = lv_obj_get_scroll_left(obj) + lv_obj_get_scroll_right(obj);
-            if(scroll_max < 0) scroll_max = 0;
-
-            if(x > scroll_max) x = scroll_max;
-        }
-    }
-    else {
-        if(x > 0) x = 0;
-        if(x < 0) {
-            lv_coord_t  scroll_max = lv_obj_get_scroll_left(obj) + lv_obj_get_scroll_right(obj);
-            if(scroll_max < 0) scroll_max = 0;
-
-            if(x < -scroll_max) x = -scroll_max;
-        }
-    }
-
     lv_coord_t scroll_x = lv_obj_get_scroll_x(obj);
     lv_coord_t diff = -x + scroll_x;
 
-    lv_obj_scroll_by(obj, diff, 0, anim_en);
+    lv_obj_scroll_by_bounded(obj, diff, 0, anim_en);
 }
 
 void lv_obj_scroll_to_y(lv_obj_t * obj, lv_coord_t y, lv_anim_enable_t anim_en)
 {
     lv_anim_del(obj, scroll_y_anim);
 
-    /*Don't let scroll more then naturally possible by the size of the content*/
-    if(y < 0) y = 0;
-    if(y > 0) {
-        lv_coord_t  scroll_max = lv_obj_get_scroll_top(obj) + lv_obj_get_scroll_bottom(obj);
-        if(scroll_max < 0) scroll_max = 0;
-        if(y > scroll_max) y = scroll_max;
-    }
-
     lv_coord_t scroll_y = lv_obj_get_scroll_y(obj);
     lv_coord_t diff = -y + scroll_y;
 
-    lv_obj_scroll_by(obj, 0, diff, anim_en);
+    lv_obj_scroll_by_bounded(obj, 0, diff, anim_en);
 }
 
 void lv_obj_scroll_to_view(lv_obj_t * obj, lv_anim_enable_t anim_en)
@@ -452,15 +473,18 @@ void lv_obj_get_scrollbar_area(lv_obj_t * obj, lv_area_t * hor_area, lv_area_t *
 
     bool rtl = lv_obj_get_style_base_dir(obj, LV_PART_SCROLLBAR) == LV_BASE_DIR_RTL ? true : false;
 
-    lv_coord_t end_space = lv_obj_get_style_pad_top(obj, LV_PART_SCROLLBAR);
-    lv_coord_t side_space = lv_obj_get_style_pad_right(obj, LV_PART_SCROLLBAR);
+    lv_coord_t top_space = lv_obj_get_style_pad_top(obj, LV_PART_SCROLLBAR);
+    lv_coord_t bottom_space = lv_obj_get_style_pad_bottom(obj, LV_PART_SCROLLBAR);
+    lv_coord_t left_space = lv_obj_get_style_pad_left(obj, LV_PART_SCROLLBAR);
+    lv_coord_t right_space = lv_obj_get_style_pad_right(obj, LV_PART_SCROLLBAR);
     lv_coord_t tickness = lv_obj_get_style_width(obj, LV_PART_SCROLLBAR);
 
     lv_coord_t obj_h = lv_obj_get_height(obj);
     lv_coord_t obj_w = lv_obj_get_width(obj);
 
-    lv_coord_t ver_reg_space = ver_draw ? tickness + side_space : 0;
-    lv_coord_t hor_req_space = hor_draw ? tickness + side_space : 0;
+    /*Space required for the vertical and horizontal scrollbars*/
+    lv_coord_t ver_reg_space = ver_draw ? tickness : 0;
+    lv_coord_t hor_req_space = hor_draw ? tickness : 0;
     lv_coord_t rem;
 
     if(lv_obj_get_style_bg_opa(obj, LV_PART_SCROLLBAR) < LV_OPA_MIN &&
@@ -468,42 +492,46 @@ void lv_obj_get_scrollbar_area(lv_obj_t * obj, lv_area_t * hor_area, lv_area_t *
         return;
     }
 
-    /*Draw horizontal scrollbar if the mode is ON or can be scrolled in this direction*/
+    /*Draw vertical scrollbar if the mode is ON or can be scrolled in this direction*/
     lv_coord_t content_h = obj_h + st + sb;
     if(ver_draw && content_h) {
         ver_area->y1 = obj->coords.y1;
         ver_area->y2 = obj->coords.y2;
         if(rtl) {
-            ver_area->x1 = obj->coords.x1 + side_space;
+            ver_area->x1 = obj->coords.x1 + left_space;
             ver_area->x2 = ver_area->x1 + tickness - 1;
         }
         else {
-            ver_area->x2 = obj->coords.x2 - side_space;
+            ver_area->x2 = obj->coords.x2 - right_space;
             ver_area->x1 = ver_area->x2 - tickness + 1;
         }
 
-        lv_coord_t sb_h = ((obj_h - end_space * 2 - hor_req_space) * obj_h) / content_h;
+        lv_coord_t sb_h = ((obj_h - top_space - bottom_space - hor_req_space) * obj_h) / content_h;
         sb_h = LV_MAX(sb_h, SCROLLBAR_MIN_SIZE);
-        rem = (obj_h - end_space * 2 - hor_req_space) -
+        rem = (obj_h - top_space - bottom_space - hor_req_space) -
               sb_h;  /*Remaining size from the scrollbar track that is not the scrollbar itself*/
         lv_coord_t scroll_h = content_h - obj_h; /*The size of the content which can be really scrolled*/
         if(scroll_h <= 0) {
-            ver_area->y1 = obj->coords.y1 + end_space;
-            ver_area->y2 = obj->coords.y2 - end_space - hor_req_space - 1;
+            ver_area->y1 = obj->coords.y1 + top_space;
+            ver_area->y2 = obj->coords.y2 - bottom_space - hor_req_space - 1;
         }
         else {
             lv_coord_t sb_y = (rem * sb) / scroll_h;
             sb_y = rem - sb_y;
 
-            ver_area->y1 = obj->coords.y1 + sb_y + end_space;
+            ver_area->y1 = obj->coords.y1 + sb_y + top_space;
             ver_area->y2 = ver_area->y1 + sb_h - 1;
-            if(ver_area->y1 < obj->coords.y1 + end_space) {
-                ver_area->y1 = obj->coords.y1 + end_space;
-                if(ver_area->y1 + SCROLLBAR_MIN_SIZE > ver_area->y2)ver_area->y2 = ver_area->y1 + SCROLLBAR_MIN_SIZE;
+            if(ver_area->y1 < obj->coords.y1 + top_space) {
+                ver_area->y1 = obj->coords.y1 + top_space;
+                if(ver_area->y1 + SCROLLBAR_MIN_SIZE > ver_area->y2) {
+                    ver_area->y2 = ver_area->y1 + SCROLLBAR_MIN_SIZE;
+                }
             }
-            if(ver_area->y2 > obj->coords.y2 - hor_req_space - end_space) {
-                ver_area->y2 = obj->coords.y2 - hor_req_space - end_space;
-                if(ver_area->y2 - SCROLLBAR_MIN_SIZE < ver_area->y1)ver_area->y1 = ver_area->y2 - SCROLLBAR_MIN_SIZE;
+            if(ver_area->y2 > obj->coords.y2 - hor_req_space - bottom_space) {
+                ver_area->y2 = obj->coords.y2 - hor_req_space - bottom_space;
+                if(ver_area->y2 - SCROLLBAR_MIN_SIZE < ver_area->y1) {
+                    ver_area->y1 = ver_area->y2 - SCROLLBAR_MIN_SIZE;
+                }
             }
         }
     }
@@ -511,24 +539,24 @@ void lv_obj_get_scrollbar_area(lv_obj_t * obj, lv_area_t * hor_area, lv_area_t *
     /*Draw horizontal scrollbar if the mode is ON or can be scrolled in this direction*/
     lv_coord_t content_w = obj_w + sl + sr;
     if(hor_draw && content_w) {
-        hor_area->y2 = obj->coords.y2 - side_space;
+        hor_area->y2 = obj->coords.y2 - bottom_space;
         hor_area->y1 = hor_area->y2 - tickness + 1;
         hor_area->x1 = obj->coords.x1;
         hor_area->x2 = obj->coords.x2;
 
-        lv_coord_t sb_w = ((obj_w - end_space * 2 - ver_reg_space) * obj_w) / content_w;
+        lv_coord_t sb_w = ((obj_w - left_space - right_space - ver_reg_space) * obj_w) / content_w;
         sb_w = LV_MAX(sb_w, SCROLLBAR_MIN_SIZE);
-        rem = (obj_w - end_space * 2 - ver_reg_space) -
+        rem = (obj_w - left_space - right_space - ver_reg_space) -
               sb_w;  /*Remaining size from the scrollbar track that is not the scrollbar itself*/
         lv_coord_t scroll_w = content_w - obj_w; /*The size of the content which can be really scrolled*/
         if(scroll_w <= 0) {
             if(rtl) {
-                hor_area->x1 = obj->coords.x1 + end_space + ver_reg_space - 1;
-                hor_area->x2 = obj->coords.x2 - end_space;
+                hor_area->x1 = obj->coords.x1 + left_space + ver_reg_space - 1;
+                hor_area->x2 = obj->coords.x2 - right_space;
             }
             else {
-                hor_area->x1 = obj->coords.x1 + end_space;
-                hor_area->x2 = obj->coords.x2 - end_space - ver_reg_space - 1;
+                hor_area->x1 = obj->coords.x1 + left_space;
+                hor_area->x2 = obj->coords.x2 - right_space - ver_reg_space - 1;
             }
         }
         else {
@@ -536,27 +564,35 @@ void lv_obj_get_scrollbar_area(lv_obj_t * obj, lv_area_t * hor_area, lv_area_t *
             sb_x = rem - sb_x;
 
             if(rtl) {
-                hor_area->x1 = obj->coords.x1 + sb_x + end_space + ver_reg_space;
+                hor_area->x1 = obj->coords.x1 + sb_x + left_space + ver_reg_space;
                 hor_area->x2 = hor_area->x1 + sb_w - 1;
-                if(hor_area->x1 < obj->coords.x1 + end_space + ver_reg_space) {
-                    hor_area->x1 = obj->coords.x1 + end_space + ver_reg_space;
-                    if(hor_area->x1 + SCROLLBAR_MIN_SIZE > hor_area->x2) hor_area->x2 = hor_area->x1 + SCROLLBAR_MIN_SIZE;
+                if(hor_area->x1 < obj->coords.x1 + left_space + ver_reg_space) {
+                    hor_area->x1 = obj->coords.x1 + left_space + ver_reg_space;
+                    if(hor_area->x1 + SCROLLBAR_MIN_SIZE > hor_area->x2) {
+                        hor_area->x2 = hor_area->x1 + SCROLLBAR_MIN_SIZE;
+                    }
                 }
-                if(hor_area->x2 > obj->coords.x2 - end_space) {
-                    hor_area->x2 = obj->coords.x2 - end_space;
-                    if(hor_area->x2 - SCROLLBAR_MIN_SIZE < hor_area->x1) hor_area->x1 = hor_area->x2 - SCROLLBAR_MIN_SIZE;
+                if(hor_area->x2 > obj->coords.x2 - right_space) {
+                    hor_area->x2 = obj->coords.x2 - right_space;
+                    if(hor_area->x2 - SCROLLBAR_MIN_SIZE < hor_area->x1) {
+                        hor_area->x1 = hor_area->x2 - SCROLLBAR_MIN_SIZE;
+                    }
                 }
             }
             else {
-                hor_area->x1 = obj->coords.x1 + sb_x + end_space;
+                hor_area->x1 = obj->coords.x1 + sb_x + left_space;
                 hor_area->x2 = hor_area->x1 + sb_w - 1;
-                if(hor_area->x1 < obj->coords.x1 + end_space) {
-                    hor_area->x1 = obj->coords.x1 + end_space;
-                    if(hor_area->x1 + SCROLLBAR_MIN_SIZE > hor_area->x2) hor_area->x2 = hor_area->x1 + SCROLLBAR_MIN_SIZE;
+                if(hor_area->x1 < obj->coords.x1 + left_space) {
+                    hor_area->x1 = obj->coords.x1 + left_space;
+                    if(hor_area->x1 + SCROLLBAR_MIN_SIZE > hor_area->x2) {
+                        hor_area->x2 = hor_area->x1 + SCROLLBAR_MIN_SIZE;
+                    }
                 }
-                if(hor_area->x2 > obj->coords.x2 - ver_reg_space - end_space) {
-                    hor_area->x2 = obj->coords.x2 - ver_reg_space - end_space;
-                    if(hor_area->x2 - SCROLLBAR_MIN_SIZE < hor_area->x1) hor_area->x1 = hor_area->x2 - SCROLLBAR_MIN_SIZE;
+                if(hor_area->x2 > obj->coords.x2 - ver_reg_space - right_space) {
+                    hor_area->x2 = obj->coords.x2 - ver_reg_space - right_space;
+                    if(hor_area->x2 - SCROLLBAR_MIN_SIZE < hor_area->x1) {
+                        hor_area->x1 = hor_area->x2 - SCROLLBAR_MIN_SIZE;
+                    }
                 }
             }
         }
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.h
index fc52e8eea..c9fdd720d 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.h
@@ -183,17 +183,27 @@ void lv_obj_get_scroll_end(struct _lv_obj_t  * obj, lv_point_t * end);
  *====================*/
 
 /**
- *
  * Scroll by a given amount of pixels
  * @param obj       pointer to an object to scroll
- * @param x         pixels to scroll horizontally
- * @param y         pixels to scroll vertically
+ * @param dx         pixels to scroll horizontally
+ * @param dy         pixels to scroll vertically
  * @param anim_en   LV_ANIM_ON: scroll with animation; LV_ANIM_OFF: scroll immediately
  * @note            > 0 value means scroll right/bottom (show the more content on the right/bottom)
- * @note
+ * @note            e.g. dy = -20 means scroll down 20 px
  */
 void lv_obj_scroll_by(struct _lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_anim_enable_t anim_en);
 
+/**
+ * Scroll by a given amount of pixels.
+ * `dx` and `dy` will be limited internally to allow scrolling only on the content area.
+ * @param obj       pointer to an object to scroll
+ * @param dx        pixels to scroll horizontally
+ * @param dy        pixels to scroll vertically
+ * @param anim_en   LV_ANIM_ON: scroll with animation; LV_ANIM_OFF: scroll immediately
+ * @note            e.g. dy = -20 means scroll down 20 px
+ */
+void lv_obj_scroll_by_bounded(struct _lv_obj_t * obj, lv_coord_t dx, lv_coord_t dy, lv_anim_enable_t anim_en);
+
 /**
  * Scroll to a given coordinate on an object.
  * `x` and `y` will be limited internally to allow scrolling only on the content area.
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.c
index 57566fd59..82e1ebba2 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.c
@@ -269,7 +269,7 @@ lv_res_t lv_obj_get_local_style_prop(lv_obj_t * obj, lv_style_prop_t prop, lv_st
     uint32_t i;
     for(i = 0; i < obj->style_cnt; i++) {
         if(obj->styles[i].is_local &&
-           obj->styles[i].selector ==  selector) {
+           obj->styles[i].selector == selector) {
             return lv_style_get_prop(obj->styles[i].style, prop, value);
         }
     }
@@ -422,7 +422,7 @@ void lv_obj_fade_in(lv_obj_t * obj, uint32_t time, uint32_t delay)
     lv_anim_t a;
     lv_anim_init(&a);
     lv_anim_set_var(&a, obj);
-    lv_anim_set_values(&a, LV_OPA_TRANSP, LV_OPA_COVER);
+    lv_anim_set_values(&a, 0, LV_OPA_COVER);
     lv_anim_set_exec_cb(&a, fade_anim_cb);
     lv_anim_set_ready_cb(&a, fade_in_anim_ready);
     lv_anim_set_time(&a, time);
@@ -435,7 +435,7 @@ void lv_obj_fade_out(lv_obj_t * obj, uint32_t time, uint32_t delay)
     lv_anim_t a;
     lv_anim_init(&a);
     lv_anim_set_var(&a, obj);
-    lv_anim_set_values(&a, LV_OPA_COVER, LV_OPA_TRANSP);
+    lv_anim_set_values(&a, lv_obj_get_style_opa(obj, 0), LV_OPA_TRANSP);
     lv_anim_set_exec_cb(&a, fade_anim_cb);
     lv_anim_set_time(&a, time);
     lv_anim_set_delay(&a, delay);
@@ -468,12 +468,11 @@ lv_text_align_t lv_obj_calculate_style_text_align(const struct _lv_obj_t * obj,
 /**
  * Get the local style of an object for a given part and for a given state.
  * If the local style for the part-state pair doesn't exist allocate and return it.
- * @param obj   pointer to an object
- * @param part  the part in whose local style to get
- * @param state the state in whose local style to get
+ * @param obj pointer to an object
+ * @param selector OR-ed value of parts and state for which the style should be get
  * @return pointer to the local style
  */
-static lv_style_t * get_local_style(lv_obj_t * obj,  lv_style_selector_t selector)
+static lv_style_t * get_local_style(lv_obj_t * obj, lv_style_selector_t selector)
 {
     uint32_t i;
     for(i = 0; i < obj->style_cnt; i++) {
@@ -506,8 +505,7 @@ static lv_style_t * get_local_style(lv_obj_t * obj,  lv_style_selector_t selecto
  * Get the transition style of an object for a given part and for a given state.
  * If the transition style for the part-state pair doesn't exist allocate and return it.
  * @param obj   pointer to an object
- * @param part  the part in whose local style to get
- * @param state the state in whose local style to get
+ * @param selector OR-ed value of parts and state for which the style should be get
  * @return pointer to the transition style
  */
 static _lv_obj_style_t * get_trans_style(lv_obj_t * obj,  lv_style_selector_t selector)
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.h
index d21f40cec..7fb2723c8 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.h
@@ -133,10 +133,9 @@ lv_style_value_t lv_obj_get_style_prop(const struct _lv_obj_t * obj, lv_part_t p
 /**
  * Set local style property on an object's part and state.
  * @param obj       pointer to an object
- * @param part      a part to which the property should be added
- * @param state     a state to which the property should be added
  * @param prop      the property
  * @param value     value of the property. The correct element should be set according to the type of the property
+ * @param selector  OR-ed value of parts and state for which the style should be set
  */
 void lv_obj_set_local_style_prop(struct _lv_obj_t * obj, lv_style_prop_t prop, lv_style_value_t value,
                                  lv_style_selector_t selector);
@@ -147,9 +146,8 @@ lv_res_t lv_obj_get_local_style_prop(struct _lv_obj_t * obj, lv_style_prop_t pro
 /**
  * Remove a local style property from a part of an object with a given state.
  * @param obj       pointer to an object
- * @param part      the part of the object which style property should be removed.
- * @param state     the state from which the property should be removed.
  * @param prop      a style property to remove.
+ * @param selector  OR-ed value of parts and state for which the style should be removed
  * @return true     the property was found and removed; false: the property was not found
  */
 bool lv_obj_remove_local_style_prop(struct _lv_obj_t * obj, lv_style_prop_t prop, lv_style_selector_t selector);
@@ -216,13 +214,13 @@ static inline void lv_obj_set_style_pad_ver(struct _lv_obj_t * obj, lv_coord_t v
     lv_obj_set_style_pad_bottom(obj, value, selector);
 }
 
-static inline void lv_obj_set_style_pad_gap(struct _lv_obj_t * obj,  lv_coord_t value, lv_style_selector_t selector)
+static inline void lv_obj_set_style_pad_gap(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 {
     lv_obj_set_style_pad_row(obj, value, selector);
     lv_obj_set_style_pad_column(obj, value, selector);
 }
 
-static inline void lv_obj_set_style_size(struct _lv_obj_t * obj,  lv_coord_t value, lv_style_selector_t selector)
+static inline void lv_obj_set_style_size(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 {
     lv_obj_set_style_width(obj, value, selector);
     lv_obj_set_style_height(obj, value, selector);
@@ -230,15 +228,6 @@ static inline void lv_obj_set_style_size(struct _lv_obj_t * obj,  lv_coord_t val
 
 lv_text_align_t lv_obj_calculate_style_text_align(const struct _lv_obj_t * obj, lv_part_t part, const char * txt);
 
-static inline lv_coord_t lv_obj_get_x_aligned(const struct _lv_obj_t * obj)
-{
-    return lv_obj_get_style_x(obj, LV_PART_MAIN);
-}
-
-static inline lv_coord_t lv_obj_get_y_aligned(const struct _lv_obj_t * obj)
-{
-    return lv_obj_get_style_y(obj, LV_PART_MAIN);
-}
 
 /**********************
  *      MACROS
@@ -248,4 +237,4 @@ static inline lv_coord_t lv_obj_get_y_aligned(const struct _lv_obj_t * obj)
 } /*extern "C"*/
 #endif
 
-#endif /*LV_TEMPL_H*/
+#endif /*LV_OBJ_STYLE_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.c
index 4cf91b329..8eb7ebe6d 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.c
@@ -1,4 +1,5 @@
 #include "lv_obj.h"
+
 void lv_obj_set_style_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 {
     lv_style_value_t v = {
@@ -167,94 +168,6 @@ void lv_obj_set_style_pad_column(struct _lv_obj_t * obj, lv_coord_t value, lv_st
     lv_obj_set_local_style_prop(obj, LV_STYLE_PAD_COLUMN, v, selector);
 }
 
-void lv_obj_set_style_radius(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_RADIUS, v, selector);
-}
-
-void lv_obj_set_style_clip_corner(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_CLIP_CORNER, v, selector);
-}
-
-void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_OPA, v, selector);
-}
-
-void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .ptr = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_COLOR_FILTER_DSC, v, selector);
-}
-
-void lv_obj_set_style_color_filter_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_COLOR_FILTER_OPA, v, selector);
-}
-
-void lv_obj_set_style_anim_time(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_ANIM_TIME, v, selector);
-}
-
-void lv_obj_set_style_anim_speed(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_ANIM_SPEED, v, selector);
-}
-
-void lv_obj_set_style_transition(struct _lv_obj_t * obj, const lv_style_transition_dsc_t * value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .ptr = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSITION, v, selector);
-}
-
-void lv_obj_set_style_blend_mode(struct _lv_obj_t * obj, lv_blend_mode_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_BLEND_MODE, v, selector);
-}
-
-void lv_obj_set_style_layout(struct _lv_obj_t * obj, uint16_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_LAYOUT, v, selector);
-}
-
-void lv_obj_set_style_base_dir(struct _lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_BASE_DIR, v, selector);
-}
-
 void lv_obj_set_style_bg_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
 {
     lv_style_value_t v = {
@@ -319,6 +232,22 @@ void lv_obj_set_style_bg_grad_stop(struct _lv_obj_t * obj, lv_coord_t value, lv_
     lv_obj_set_local_style_prop(obj, LV_STYLE_BG_GRAD_STOP, v, selector);
 }
 
+void lv_obj_set_style_bg_grad(struct _lv_obj_t * obj, const lv_grad_dsc_t * value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_BG_GRAD, v, selector);
+}
+
+void lv_obj_set_style_bg_dither_mode(struct _lv_obj_t * obj, lv_dither_mode_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_BG_DITHER_MODE, v, selector);
+}
+
 void lv_obj_set_style_bg_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector)
 {
     lv_style_value_t v = {
@@ -415,102 +344,6 @@ void lv_obj_set_style_border_post(struct _lv_obj_t * obj, bool value, lv_style_s
     lv_obj_set_local_style_prop(obj, LV_STYLE_BORDER_POST, v, selector);
 }
 
-void lv_obj_set_style_text_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_COLOR, v, selector);
-}
-
-void lv_obj_set_style_text_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_COLOR_FILTERED, v, selector);
-}
-
-void lv_obj_set_style_text_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_OPA, v, selector);
-}
-
-void lv_obj_set_style_text_font(struct _lv_obj_t * obj, const lv_font_t * value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .ptr = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_FONT, v, selector);
-}
-
-void lv_obj_set_style_text_letter_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_LETTER_SPACE, v, selector);
-}
-
-void lv_obj_set_style_text_line_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_LINE_SPACE, v, selector);
-}
-
-void lv_obj_set_style_text_decor(struct _lv_obj_t * obj, lv_text_decor_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_DECOR, v, selector);
-}
-
-void lv_obj_set_style_text_align(struct _lv_obj_t * obj, lv_text_align_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_ALIGN, v, selector);
-}
-
-void lv_obj_set_style_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_OPA, v, selector);
-}
-
-void lv_obj_set_style_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_RECOLOR, v, selector);
-}
-
-void lv_obj_set_style_img_recolor_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_RECOLOR_FILTERED, v, selector);
-}
-
-void lv_obj_set_style_img_recolor_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_RECOLOR_OPA, v, selector);
-}
-
 void lv_obj_set_style_outline_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 {
     lv_style_value_t v = {
@@ -607,6 +440,38 @@ void lv_obj_set_style_shadow_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_styl
     lv_obj_set_local_style_prop(obj, LV_STYLE_SHADOW_OPA, v, selector);
 }
 
+void lv_obj_set_style_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_OPA, v, selector);
+}
+
+void lv_obj_set_style_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_RECOLOR, v, selector);
+}
+
+void lv_obj_set_style_img_recolor_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_RECOLOR_FILTERED, v, selector);
+}
+
+void lv_obj_set_style_img_recolor_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_IMG_RECOLOR_OPA, v, selector);
+}
+
 void lv_obj_set_style_line_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
 {
     lv_style_value_t v = {
@@ -711,3 +576,156 @@ void lv_obj_set_style_arc_img_src(struct _lv_obj_t * obj, const void * value, lv
     lv_obj_set_local_style_prop(obj, LV_STYLE_ARC_IMG_SRC, v, selector);
 }
 
+void lv_obj_set_style_text_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_COLOR, v, selector);
+}
+
+void lv_obj_set_style_text_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_COLOR_FILTERED, v, selector);
+}
+
+void lv_obj_set_style_text_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_OPA, v, selector);
+}
+
+void lv_obj_set_style_text_font(struct _lv_obj_t * obj, const lv_font_t * value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_FONT, v, selector);
+}
+
+void lv_obj_set_style_text_letter_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_LETTER_SPACE, v, selector);
+}
+
+void lv_obj_set_style_text_line_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_LINE_SPACE, v, selector);
+}
+
+void lv_obj_set_style_text_decor(struct _lv_obj_t * obj, lv_text_decor_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_DECOR, v, selector);
+}
+
+void lv_obj_set_style_text_align(struct _lv_obj_t * obj, lv_text_align_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TEXT_ALIGN, v, selector);
+}
+
+void lv_obj_set_style_radius(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_RADIUS, v, selector);
+}
+
+void lv_obj_set_style_clip_corner(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_CLIP_CORNER, v, selector);
+}
+
+void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_OPA, v, selector);
+}
+
+void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, const lv_color_filter_dsc_t * value,
+                                       lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_COLOR_FILTER_DSC, v, selector);
+}
+
+void lv_obj_set_style_color_filter_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_COLOR_FILTER_OPA, v, selector);
+}
+
+void lv_obj_set_style_anim_time(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_ANIM_TIME, v, selector);
+}
+
+void lv_obj_set_style_anim_speed(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_ANIM_SPEED, v, selector);
+}
+
+void lv_obj_set_style_transition(struct _lv_obj_t * obj, const lv_style_transition_dsc_t * value,
+                                 lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSITION, v, selector);
+}
+
+void lv_obj_set_style_blend_mode(struct _lv_obj_t * obj, lv_blend_mode_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_BLEND_MODE, v, selector);
+}
+
+void lv_obj_set_style_layout(struct _lv_obj_t * obj, uint16_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_LAYOUT, v, selector);
+}
+
+void lv_obj_set_style_base_dir(struct _lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_obj_set_local_style_prop(obj, LV_STYLE_BASE_DIR, v, selector);
+}
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.h
index 40e490ea0..e4383d5ce 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.h
@@ -124,72 +124,6 @@ static inline lv_coord_t lv_obj_get_style_pad_column(const struct _lv_obj_t * ob
     return (lv_coord_t)v.num;
 }
 
-static inline lv_coord_t lv_obj_get_style_radius(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_RADIUS);
-    return (lv_coord_t)v.num;
-}
-
-static inline bool lv_obj_get_style_clip_corner(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_CLIP_CORNER);
-    return (bool)v.num;
-}
-
-static inline lv_opa_t lv_obj_get_style_opa(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_OPA);
-    return (lv_opa_t)v.num;
-}
-
-static inline const lv_color_filter_dsc_t * lv_obj_get_style_color_filter_dsc(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_COLOR_FILTER_DSC);
-    return (const lv_color_filter_dsc_t *)v.ptr;
-}
-
-static inline lv_opa_t lv_obj_get_style_color_filter_opa(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_COLOR_FILTER_OPA);
-    return (lv_opa_t)v.num;
-}
-
-static inline uint32_t lv_obj_get_style_anim_time(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_ANIM_TIME);
-    return (uint32_t)v.num;
-}
-
-static inline uint32_t lv_obj_get_style_anim_speed(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_ANIM_SPEED);
-    return (uint32_t)v.num;
-}
-
-static inline const lv_style_transition_dsc_t * lv_obj_get_style_transition(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSITION);
-    return (const lv_style_transition_dsc_t *)v.ptr;
-}
-
-static inline lv_blend_mode_t lv_obj_get_style_blend_mode(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BLEND_MODE);
-    return (lv_blend_mode_t)v.num;
-}
-
-static inline uint16_t lv_obj_get_style_layout(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_LAYOUT);
-    return (uint16_t)v.num;
-}
-
-static inline lv_base_dir_t lv_obj_get_style_base_dir(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BASE_DIR);
-    return (lv_base_dir_t)v.num;
-}
-
 static inline lv_color_t lv_obj_get_style_bg_color(const struct _lv_obj_t * obj, uint32_t part)
 {
     lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BG_COLOR);
@@ -238,6 +172,18 @@ static inline lv_coord_t lv_obj_get_style_bg_grad_stop(const struct _lv_obj_t *
     return (lv_coord_t)v.num;
 }
 
+static inline const lv_grad_dsc_t * lv_obj_get_style_bg_grad(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BG_GRAD);
+    return (const lv_grad_dsc_t *)v.ptr;
+}
+
+static inline lv_dither_mode_t lv_obj_get_style_bg_dither_mode(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BG_DITHER_MODE);
+    return (lv_dither_mode_t)v.num;
+}
+
 static inline const void * lv_obj_get_style_bg_img_src(const struct _lv_obj_t * obj, uint32_t part)
 {
     lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BG_IMG_SRC);
@@ -310,78 +256,6 @@ static inline bool lv_obj_get_style_border_post(const struct _lv_obj_t * obj, ui
     return (bool)v.num;
 }
 
-static inline lv_color_t lv_obj_get_style_text_color(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_COLOR);
-    return v.color;
-}
-
-static inline lv_color_t lv_obj_get_style_text_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_COLOR_FILTERED);
-    return v.color;
-}
-
-static inline lv_opa_t lv_obj_get_style_text_opa(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_OPA);
-    return (lv_opa_t)v.num;
-}
-
-static inline const lv_font_t * lv_obj_get_style_text_font(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_FONT);
-    return (const lv_font_t *)v.ptr;
-}
-
-static inline lv_coord_t lv_obj_get_style_text_letter_space(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_LETTER_SPACE);
-    return (lv_coord_t)v.num;
-}
-
-static inline lv_coord_t lv_obj_get_style_text_line_space(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_LINE_SPACE);
-    return (lv_coord_t)v.num;
-}
-
-static inline lv_text_decor_t lv_obj_get_style_text_decor(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_DECOR);
-    return (lv_text_decor_t)v.num;
-}
-
-static inline lv_text_align_t lv_obj_get_style_text_align(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_ALIGN);
-    return (lv_text_align_t)v.num;
-}
-
-static inline lv_opa_t lv_obj_get_style_img_opa(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_OPA);
-    return (lv_opa_t)v.num;
-}
-
-static inline lv_color_t lv_obj_get_style_img_recolor(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_RECOLOR);
-    return v.color;
-}
-
-static inline lv_color_t lv_obj_get_style_img_recolor_filtered(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_RECOLOR_FILTERED);
-    return v.color;
-}
-
-static inline lv_opa_t lv_obj_get_style_img_recolor_opa(const struct _lv_obj_t * obj, uint32_t part)
-{
-    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_RECOLOR_OPA);
-    return (lv_opa_t)v.num;
-}
-
 static inline lv_coord_t lv_obj_get_style_outline_width(const struct _lv_obj_t * obj, uint32_t part)
 {
     lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_OUTLINE_WIDTH);
@@ -454,6 +328,30 @@ static inline lv_opa_t lv_obj_get_style_shadow_opa(const struct _lv_obj_t * obj,
     return (lv_opa_t)v.num;
 }
 
+static inline lv_opa_t lv_obj_get_style_img_opa(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_OPA);
+    return (lv_opa_t)v.num;
+}
+
+static inline lv_color_t lv_obj_get_style_img_recolor(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_RECOLOR);
+    return v.color;
+}
+
+static inline lv_color_t lv_obj_get_style_img_recolor_filtered(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_RECOLOR_FILTERED);
+    return v.color;
+}
+
+static inline lv_opa_t lv_obj_get_style_img_recolor_opa(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_IMG_RECOLOR_OPA);
+    return (lv_opa_t)v.num;
+}
+
 static inline lv_coord_t lv_obj_get_style_line_width(const struct _lv_obj_t * obj, uint32_t part)
 {
     lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_LINE_WIDTH);
@@ -532,6 +430,121 @@ static inline const void * lv_obj_get_style_arc_img_src(const struct _lv_obj_t *
     return (const void *)v.ptr;
 }
 
+static inline lv_color_t lv_obj_get_style_text_color(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_COLOR);
+    return v.color;
+}
+
+static inline lv_color_t lv_obj_get_style_text_color_filtered(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_COLOR_FILTERED);
+    return v.color;
+}
+
+static inline lv_opa_t lv_obj_get_style_text_opa(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_OPA);
+    return (lv_opa_t)v.num;
+}
+
+static inline const lv_font_t * lv_obj_get_style_text_font(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_FONT);
+    return (const lv_font_t *)v.ptr;
+}
+
+static inline lv_coord_t lv_obj_get_style_text_letter_space(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_LETTER_SPACE);
+    return (lv_coord_t)v.num;
+}
+
+static inline lv_coord_t lv_obj_get_style_text_line_space(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_LINE_SPACE);
+    return (lv_coord_t)v.num;
+}
+
+static inline lv_text_decor_t lv_obj_get_style_text_decor(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_DECOR);
+    return (lv_text_decor_t)v.num;
+}
+
+static inline lv_text_align_t lv_obj_get_style_text_align(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TEXT_ALIGN);
+    return (lv_text_align_t)v.num;
+}
+
+static inline lv_coord_t lv_obj_get_style_radius(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_RADIUS);
+    return (lv_coord_t)v.num;
+}
+
+static inline bool lv_obj_get_style_clip_corner(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_CLIP_CORNER);
+    return (bool)v.num;
+}
+
+static inline lv_opa_t lv_obj_get_style_opa(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_OPA);
+    return (lv_opa_t)v.num;
+}
+
+static inline const lv_color_filter_dsc_t * lv_obj_get_style_color_filter_dsc(const struct _lv_obj_t * obj,
+                                                                              uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_COLOR_FILTER_DSC);
+    return (const lv_color_filter_dsc_t *)v.ptr;
+}
+
+static inline lv_opa_t lv_obj_get_style_color_filter_opa(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_COLOR_FILTER_OPA);
+    return (lv_opa_t)v.num;
+}
+
+static inline uint32_t lv_obj_get_style_anim_time(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_ANIM_TIME);
+    return (uint32_t)v.num;
+}
+
+static inline uint32_t lv_obj_get_style_anim_speed(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_ANIM_SPEED);
+    return (uint32_t)v.num;
+}
+
+static inline const lv_style_transition_dsc_t * lv_obj_get_style_transition(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSITION);
+    return (const lv_style_transition_dsc_t *)v.ptr;
+}
+
+static inline lv_blend_mode_t lv_obj_get_style_blend_mode(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BLEND_MODE);
+    return (lv_blend_mode_t)v.num;
+}
+
+static inline uint16_t lv_obj_get_style_layout(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_LAYOUT);
+    return (uint16_t)v.num;
+}
+
+static inline lv_base_dir_t lv_obj_get_style_base_dir(const struct _lv_obj_t * obj, uint32_t part)
+{
+    lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_BASE_DIR);
+    return (lv_base_dir_t)v.num;
+}
+
 void lv_obj_set_style_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_min_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_max_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
@@ -553,17 +566,6 @@ void lv_obj_set_style_pad_left(struct _lv_obj_t * obj, lv_coord_t value, lv_styl
 void lv_obj_set_style_pad_right(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_pad_row(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_pad_column(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
-void lv_obj_set_style_radius(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
-void lv_obj_set_style_clip_corner(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector);
-void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
-void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector);
-void lv_obj_set_style_color_filter_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
-void lv_obj_set_style_anim_time(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector);
-void lv_obj_set_style_anim_speed(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector);
-void lv_obj_set_style_transition(struct _lv_obj_t * obj, const lv_style_transition_dsc_t * value, lv_style_selector_t selector);
-void lv_obj_set_style_blend_mode(struct _lv_obj_t * obj, lv_blend_mode_t value, lv_style_selector_t selector);
-void lv_obj_set_style_layout(struct _lv_obj_t * obj, uint16_t value, lv_style_selector_t selector);
-void lv_obj_set_style_base_dir(struct _lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
@@ -572,6 +574,8 @@ void lv_obj_set_style_bg_grad_color_filtered(struct _lv_obj_t * obj, lv_color_t
 void lv_obj_set_style_bg_grad_dir(struct _lv_obj_t * obj, lv_grad_dir_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_main_stop(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_grad_stop(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
+void lv_obj_set_style_bg_grad(struct _lv_obj_t * obj, const lv_grad_dsc_t * value, lv_style_selector_t selector);
+void lv_obj_set_style_bg_dither_mode(struct _lv_obj_t * obj, lv_dither_mode_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
 void lv_obj_set_style_bg_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
@@ -584,18 +588,6 @@ void lv_obj_set_style_border_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_styl
 void lv_obj_set_style_border_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_border_side(struct _lv_obj_t * obj, lv_border_side_t value, lv_style_selector_t selector);
 void lv_obj_set_style_border_post(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector);
-void lv_obj_set_style_text_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
-void lv_obj_set_style_text_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
-void lv_obj_set_style_text_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
-void lv_obj_set_style_text_font(struct _lv_obj_t * obj, const lv_font_t * value, lv_style_selector_t selector);
-void lv_obj_set_style_text_letter_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
-void lv_obj_set_style_text_line_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
-void lv_obj_set_style_text_decor(struct _lv_obj_t * obj, lv_text_decor_t value, lv_style_selector_t selector);
-void lv_obj_set_style_text_align(struct _lv_obj_t * obj, lv_text_align_t value, lv_style_selector_t selector);
-void lv_obj_set_style_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
-void lv_obj_set_style_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
-void lv_obj_set_style_img_recolor_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
-void lv_obj_set_style_img_recolor_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
 void lv_obj_set_style_outline_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_outline_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
 void lv_obj_set_style_outline_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
@@ -608,6 +600,10 @@ void lv_obj_set_style_shadow_spread(struct _lv_obj_t * obj, lv_coord_t value, lv
 void lv_obj_set_style_shadow_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
 void lv_obj_set_style_shadow_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
 void lv_obj_set_style_shadow_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
+void lv_obj_set_style_img_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
+void lv_obj_set_style_img_recolor(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
+void lv_obj_set_style_img_recolor_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
+void lv_obj_set_style_img_recolor_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
 void lv_obj_set_style_line_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_line_dash_width(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
 void lv_obj_set_style_line_dash_gap(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
@@ -621,3 +617,24 @@ void lv_obj_set_style_arc_color(struct _lv_obj_t * obj, lv_color_t value, lv_sty
 void lv_obj_set_style_arc_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
 void lv_obj_set_style_arc_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
 void lv_obj_set_style_arc_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector);
+void lv_obj_set_style_text_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
+void lv_obj_set_style_text_color_filtered(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
+void lv_obj_set_style_text_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
+void lv_obj_set_style_text_font(struct _lv_obj_t * obj, const lv_font_t * value, lv_style_selector_t selector);
+void lv_obj_set_style_text_letter_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
+void lv_obj_set_style_text_line_space(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
+void lv_obj_set_style_text_decor(struct _lv_obj_t * obj, lv_text_decor_t value, lv_style_selector_t selector);
+void lv_obj_set_style_text_align(struct _lv_obj_t * obj, lv_text_align_t value, lv_style_selector_t selector);
+void lv_obj_set_style_radius(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector);
+void lv_obj_set_style_clip_corner(struct _lv_obj_t * obj, bool value, lv_style_selector_t selector);
+void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
+void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, const lv_color_filter_dsc_t * value,
+                                       lv_style_selector_t selector);
+void lv_obj_set_style_color_filter_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector);
+void lv_obj_set_style_anim_time(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector);
+void lv_obj_set_style_anim_speed(struct _lv_obj_t * obj, uint32_t value, lv_style_selector_t selector);
+void lv_obj_set_style_transition(struct _lv_obj_t * obj, const lv_style_transition_dsc_t * value,
+                                 lv_style_selector_t selector);
+void lv_obj_set_style_blend_mode(struct _lv_obj_t * obj, lv_blend_mode_t value, lv_style_selector_t selector);
+void lv_obj_set_style_layout(struct _lv_obj_t * obj, uint16_t value, lv_style_selector_t selector);
+void lv_obj_set_style_base_dir(struct _lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector);
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.c
index 3adf72183..cf82553d6 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.c
@@ -172,6 +172,8 @@ void lv_obj_set_parent(lv_obj_t * obj, lv_obj_t * parent)
     obj->parent = parent;
 
     /*Notify the original parent because one of its children is lost*/
+    lv_obj_readjust_scroll(old_parent, LV_ANIM_OFF);
+    lv_obj_scrollbar_invalidate(old_parent);
     lv_event_send(old_parent, LV_EVENT_CHILD_CHANGED, obj);
     lv_event_send(old_parent, LV_EVENT_CHILD_DELETED, NULL);
 
@@ -188,6 +190,10 @@ void lv_obj_move_to_index(lv_obj_t * obj, int32_t index)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
 
+    if(index < 0) {
+        index = lv_obj_get_child_cnt(lv_obj_get_parent(obj)) + index;
+    }
+
     const int32_t old_index = lv_obj_get_index(obj);
 
     lv_obj_t * parent = lv_obj_get_parent(obj);
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.h
index 1c714c420..bee9e1604 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.h
@@ -97,8 +97,8 @@ void lv_obj_swap(struct _lv_obj_t * obj1, struct _lv_obj_t * obj2);
  * moves the object to the given index in its parent.
  * When used in listboxes, it can be used to sort the listbox items.
  * @param obj  pointer to the object to be moved.
- * @param index  new index in parent.
- * @note to move to the foreground: lv_obj_move_to_index(obj, 0)
+ * @param index  new index in parent. -1 to count from the back
+ * @note to move to the background: lv_obj_move_to_index(obj, 0)
  * @note to move forward (up): lv_obj_move_to_index(obj, lv_obj_get_index(obj) - 1)
  */
 void lv_obj_move_to_index(struct _lv_obj_t * obj, int32_t index);
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_refr.c b/lib/libesp32_lvgl/lvgl/src/core/lv_refr.c
index a44060a5e..b9b569f90 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_refr.c
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_refr.c
@@ -29,6 +29,23 @@
 /**********************
  *      TYPEDEFS
  **********************/
+typedef struct {
+    uint32_t    perf_last_time;
+    uint32_t    elaps_sum;
+    uint32_t    frame_cnt;
+    uint32_t    fps_sum_cnt;
+    uint32_t    fps_sum_all;
+#if LV_USE_LABEL
+    lv_obj_t  * perf_label;
+#endif
+} perf_monitor_t;
+
+typedef struct {
+    uint32_t     mem_last_time;
+#if LV_USE_LABEL
+    lv_obj_t  *  mem_label;
+#endif
+} mem_monitor_t;
 
 /**********************
  *  STATIC PROTOTYPES
@@ -36,21 +53,32 @@
 static void lv_refr_join_area(void);
 static void lv_refr_areas(void);
 static void lv_refr_area(const lv_area_t * area_p);
-static void lv_refr_area_part(const lv_area_t * area_p);
+static void lv_refr_area_part(lv_draw_ctx_t * draw_ctx);
 static lv_obj_t * lv_refr_get_top_obj(const lv_area_t * area_p, lv_obj_t * obj);
-static void lv_refr_obj_and_children(lv_obj_t * top_p, const lv_area_t * mask_p);
-static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p);
-static void draw_buf_flush(void);
+static void lv_refr_obj_and_children(lv_draw_ctx_t * draw_ctx, lv_obj_t * top_obj);
+static uint32_t get_max_row(lv_disp_t * disp, lv_coord_t area_w, lv_coord_t area_h);
+static void draw_buf_flush(lv_disp_t * disp);
 static void call_flush_cb(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_p);
 
+#if LV_USE_PERF_MONITOR
+    static void perf_monitor_init(perf_monitor_t * perf_monitor);
+#endif
+#if LV_USE_MEM_MONITOR
+    static void mem_monitor_init(mem_monitor_t * mem_monitor);
+#endif
+
 /**********************
  *  STATIC VARIABLES
  **********************/
 static uint32_t px_num;
 static lv_disp_t * disp_refr; /*Display being refreshed*/
+
 #if LV_USE_PERF_MONITOR
-    static uint32_t fps_sum_cnt;
-    static uint32_t fps_sum_all;
+    static perf_monitor_t   perf_monitor;
+#endif
+
+#if LV_USE_MEM_MONITOR
+    static mem_monitor_t    mem_monitor;
 #endif
 
 /**********************
@@ -71,33 +99,98 @@ static lv_disp_t * disp_refr; /*Display being refreshed*/
  */
 void _lv_refr_init(void)
 {
-    /*Nothing to do*/
+#if LV_USE_PERF_MONITOR
+    perf_monitor_init(&perf_monitor);
+#endif
+#if LV_USE_MEM_MONITOR
+    mem_monitor_init(&mem_monitor);
+#endif
 }
 
-/**
- * Redraw the invalidated areas now.
- * Normally the redrawing is periodically executed in `lv_timer_handler` but a long blocking process
- * can prevent the call of `lv_timer_handler`. In this case if the GUI is updated in the process
- * (e.g. progress bar) this function can be called when the screen should be updated.
- * @param disp pointer to display to refresh. NULL to refresh all displays.
- */
 void lv_refr_now(lv_disp_t * disp)
 {
     lv_anim_refr_now();
 
     if(disp) {
-        _lv_disp_refr_timer(disp->refr_timer);
+        if(disp->refr_timer) _lv_disp_refr_timer(disp->refr_timer);
     }
     else {
         lv_disp_t * d;
         d = lv_disp_get_next(NULL);
         while(d) {
-            _lv_disp_refr_timer(d->refr_timer);
+            if(d->refr_timer) _lv_disp_refr_timer(d->refr_timer);
             d = lv_disp_get_next(d);
         }
     }
 }
 
+void lv_refr_obj(lv_draw_ctx_t * draw_ctx, lv_obj_t * obj)
+{
+    /*Do not refresh hidden objects*/
+    if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return;
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    lv_area_t clip_coords_for_obj;
+
+    /*Truncate the clip area to `obj size + ext size` area*/
+    lv_area_t obj_coords_ext;
+    lv_obj_get_coords(obj, &obj_coords_ext);
+    lv_coord_t ext_draw_size = _lv_obj_get_ext_draw_size(obj);
+    lv_area_increase(&obj_coords_ext, ext_draw_size, ext_draw_size);
+    if(!_lv_area_intersect(&clip_coords_for_obj, clip_area_ori, &obj_coords_ext)) return;
+
+    draw_ctx->clip_area = &clip_coords_for_obj;
+
+    /*Draw the object*/
+    lv_event_send(obj, LV_EVENT_DRAW_MAIN_BEGIN, draw_ctx);
+    lv_event_send(obj, LV_EVENT_DRAW_MAIN, draw_ctx);
+    lv_event_send(obj, LV_EVENT_DRAW_MAIN_END, draw_ctx);
+
+#if LV_USE_REFR_DEBUG
+    lv_color_t debug_color = lv_color_make(lv_rand(0, 0xFF), lv_rand(0, 0xFF), lv_rand(0, 0xFF));
+    lv_draw_rect_dsc_t draw_dsc;
+    lv_draw_rect_dsc_init(&draw_dsc);
+    draw_dsc.bg_color.full = debug_color.full;
+    draw_dsc.bg_opa = LV_OPA_20;
+    draw_dsc.border_width = 1;
+    draw_dsc.border_opa = LV_OPA_30;
+    draw_dsc.border_color = debug_color;
+    lv_draw_rect(draw_ctx, &draw_dsc, &obj_coords_ext);
+#endif
+
+    /*With overflow visible keep the previous clip area to let the children visible out of this object too
+     *With not overflow visible limit the clip are to the object's coordinates to clip the children*/
+    bool refr_children = true;
+    lv_area_t clip_coords_for_children;
+    if(lv_obj_has_flag(obj, LV_OBJ_FLAG_OVERFLOW_VISIBLE)) {
+        clip_coords_for_children  = *clip_area_ori;
+    }
+    else {
+        if(!_lv_area_intersect(&clip_coords_for_children, clip_area_ori, &obj->coords)) {
+            refr_children = false;
+        }
+    }
+
+    if(refr_children) {
+        draw_ctx->clip_area = &clip_coords_for_children;
+        uint32_t i;
+        uint32_t child_cnt = lv_obj_get_child_cnt(obj);
+        for(i = 0; i < child_cnt; i++) {
+            lv_obj_t * child = obj->spec_attr->children[i];
+            lv_refr_obj(draw_ctx, child);
+        }
+    }
+
+    draw_ctx->clip_area = &clip_coords_for_obj;
+
+    /*If all the children are redrawn make 'post draw' draw*/
+    lv_event_send(obj, LV_EVENT_DRAW_POST_BEGIN, draw_ctx);
+    lv_event_send(obj, LV_EVENT_DRAW_POST, draw_ctx);
+    lv_event_send(obj, LV_EVENT_DRAW_POST_END, draw_ctx);
+
+    draw_ctx->clip_area = clip_area_ori;
+}
+
 /**
  * Invalidate an area on display to redraw it
  * @param area_p pointer to area which should be invalidated (NULL: delete the invalidated areas)
@@ -131,7 +224,7 @@ void _lv_inv_area(lv_disp_t * disp, const lv_area_t * area_p)
     if(disp->driver->full_refresh) {
         disp->inv_areas[0] = scr_area;
         disp->inv_p = 1;
-        lv_timer_resume(disp->refr_timer);
+        if(disp->refr_timer) lv_timer_resume(disp->refr_timer);
         return;
     }
 
@@ -152,7 +245,7 @@ void _lv_inv_area(lv_disp_t * disp, const lv_area_t * area_p)
         lv_area_copy(&disp->inv_areas[disp->inv_p], &scr_area);
     }
     disp->inv_p++;
-    lv_timer_resume(disp->refr_timer);
+    if(disp->refr_timer) lv_timer_resume(disp->refr_timer);
 }
 
 /**
@@ -186,15 +279,19 @@ void _lv_disp_refr_timer(lv_timer_t * tmr)
     uint32_t start = lv_tick_get();
     volatile uint32_t elaps = 0;
 
-    disp_refr = tmr->user_data;
-
+    if(tmr) {
+        disp_refr = tmr->user_data;
 #if LV_USE_PERF_MONITOR == 0 && LV_USE_MEM_MONITOR == 0
-    /**
-     * Ensure the timer does not run again automatically.
-     * This is done before refreshing in case refreshing invalidates something else.
-     */
-    lv_timer_pause(tmr);
+        /**
+         * Ensure the timer does not run again automatically.
+         * This is done before refreshing in case refreshing invalidates something else.
+         */
+        lv_timer_pause(tmr);
 #endif
+    }
+    else {
+        disp_refr = lv_disp_get_default();
+    }
 
     /*Refresh the screen's layout if required*/
     lv_obj_update_layout(disp_refr->act_scr);
@@ -218,7 +315,10 @@ void _lv_disp_refr_timer(lv_timer_t * tmr)
     /*If refresh happened ...*/
     if(disp_refr->inv_p != 0) {
         if(disp_refr->driver->full_refresh) {
-            draw_buf_flush();
+            lv_area_t disp_area;
+            lv_area_set(&disp_area, 0, 0, lv_disp_get_hor_res(disp_refr) - 1, lv_disp_get_ver_res(disp_refr) - 1);
+            disp_refr->driver->draw_ctx->buf_area = &disp_area;
+            draw_buf_flush(disp_refr);
         }
 
         /*Clean up*/
@@ -241,7 +341,7 @@ void _lv_disp_refr_timer(lv_timer_t * tmr)
 #endif
 
 #if LV_USE_PERF_MONITOR && LV_USE_LABEL
-    static lv_obj_t * perf_label = NULL;
+    lv_obj_t * perf_label = perf_monitor.perf_label;
     if(perf_label == NULL) {
         perf_label = lv_label_create(lv_layer_sys());
         lv_obj_set_style_bg_opa(perf_label, LV_OPA_50, 0);
@@ -254,38 +354,44 @@ void _lv_disp_refr_timer(lv_timer_t * tmr)
         lv_obj_set_style_text_align(perf_label, LV_TEXT_ALIGN_RIGHT, 0);
         lv_label_set_text(perf_label, "?");
         lv_obj_align(perf_label, LV_USE_PERF_MONITOR_POS, 0, 0);
+        perf_monitor.perf_label = perf_label;
     }
 
-    static uint32_t perf_last_time = 0;
-    static uint32_t elaps_sum = 0;
-    static uint32_t frame_cnt = 0;
-    if(lv_tick_elaps(perf_last_time) < 300) {
+    if(lv_tick_elaps(perf_monitor.perf_last_time) < 300) {
         if(px_num > 5000) {
-            elaps_sum += elaps;
-            frame_cnt ++;
+            perf_monitor.elaps_sum += elaps;
+            perf_monitor.frame_cnt ++;
         }
     }
     else {
-        perf_last_time = lv_tick_get();
+        perf_monitor.perf_last_time = lv_tick_get();
         uint32_t fps_limit = 1000 / disp_refr->refr_timer->period;
-        unsigned int fps;
+        uint32_t fps;
 
-        if(elaps_sum == 0) elaps_sum = 1;
-        if(frame_cnt == 0) fps = fps_limit;
-        else fps = (1000 * frame_cnt) / elaps_sum;
-        elaps_sum = 0;
-        frame_cnt = 0;
-        if(fps > fps_limit) fps = fps_limit;
+        if(perf_monitor.elaps_sum == 0) {
+            perf_monitor.elaps_sum = 1;
+        }
+        if(perf_monitor.frame_cnt == 0) {
+            fps = fps_limit;
+        }
+        else {
+            fps = (1000 * perf_monitor.frame_cnt) / perf_monitor.elaps_sum;
+        }
+        perf_monitor.elaps_sum = 0;
+        perf_monitor.frame_cnt = 0;
+        if(fps > fps_limit) {
+            fps = fps_limit;
+        }
 
-        fps_sum_all += fps;
-        fps_sum_cnt ++;
-        unsigned int cpu = 100 - lv_timer_get_idle();
-        lv_label_set_text_fmt(perf_label, "%u FPS\n%u%% CPU", fps, cpu);
+        perf_monitor.fps_sum_all += fps;
+        perf_monitor.fps_sum_cnt ++;
+        uint32_t cpu = 100 - lv_timer_get_idle();
+        lv_label_set_text_fmt(perf_label, "%"LV_PRIu32" FPS\n%"LV_PRIu32"%% CPU", fps, cpu);
     }
 #endif
 
 #if LV_USE_MEM_MONITOR && LV_MEM_CUSTOM == 0 && LV_USE_LABEL
-    static lv_obj_t * mem_label = NULL;
+    lv_obj_t * mem_label = mem_monitor.mem_label;
     if(mem_label == NULL) {
         mem_label = lv_label_create(lv_layer_sys());
         lv_obj_set_style_bg_opa(mem_label, LV_OPA_50, 0);
@@ -297,11 +403,11 @@ void _lv_disp_refr_timer(lv_timer_t * tmr)
         lv_obj_set_style_pad_right(mem_label, 3, 0);
         lv_label_set_text(mem_label, "?");
         lv_obj_align(mem_label, LV_USE_MEM_MONITOR_POS, 0, 0);
+        mem_monitor.mem_label = mem_label;
     }
 
-    static uint32_t mem_last_time = 0;
-    if(lv_tick_elaps(mem_last_time) > 300) {
-        mem_last_time = lv_tick_get();
+    if(lv_tick_elaps(mem_monitor.mem_last_time) > 300) {
+        mem_monitor.mem_last_time = lv_tick_get();
         lv_mem_monitor_t mon;
         lv_mem_monitor(&mon);
         uint32_t used_size = mon.total_size - mon.free_size;;
@@ -317,12 +423,22 @@ void _lv_disp_refr_timer(lv_timer_t * tmr)
 }
 
 #if LV_USE_PERF_MONITOR
+void lv_refr_reset_fps_counter(void)
+{
+    perf_monitor.fps_sum_all = 0;
+    perf_monitor.fps_sum_cnt = 0;
+}
+
 uint32_t lv_refr_get_fps_avg(void)
 {
-    return fps_sum_all / fps_sum_cnt;
+    if(perf_monitor.fps_sum_cnt == 0) {
+        return 0;
+    }
+    return perf_monitor.fps_sum_all / perf_monitor.fps_sum_cnt;
 }
 #endif
 
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
@@ -405,104 +521,72 @@ static void lv_refr_areas(void)
  */
 static void lv_refr_area(const lv_area_t * area_p)
 {
+    lv_draw_ctx_t * draw_ctx = disp_refr->driver->draw_ctx;
+    draw_ctx->buf = disp_refr->driver->draw_buf->buf_act;
+
     /*With full refresh just redraw directly into the buffer*/
-    if(disp_refr->driver->full_refresh) {
-        lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp_refr);
-        draw_buf->area.x1        = 0;
-        draw_buf->area.x2        = lv_disp_get_hor_res(disp_refr) - 1;
-        draw_buf->area.y1        = 0;
-        draw_buf->area.y2        = lv_disp_get_ver_res(disp_refr) - 1;
-        disp_refr->driver->draw_buf->last_part = 1;
-        lv_refr_area_part(area_p);
+    /*In direct mode draw directly on the absolute coordinates of the buffer*/
+    if(disp_refr->driver->full_refresh || disp_refr->driver->direct_mode) {
+        lv_area_t disp_area;
+        lv_area_set(&disp_area, 0, 0, lv_disp_get_hor_res(disp_refr) - 1, lv_disp_get_ver_res(disp_refr) - 1);
+        draw_ctx->buf_area = &disp_area;
+
+        if(disp_refr->driver->full_refresh) {
+            disp_refr->driver->draw_buf->last_part = 1;
+            draw_ctx->clip_area = &disp_area;
+            lv_refr_area_part(draw_ctx);
+        }
+        else {
+            disp_refr->driver->draw_buf->last_part = disp_refr->driver->draw_buf->last_area;
+            draw_ctx->clip_area = area_p;
+            lv_refr_area_part(draw_ctx);
+        }
         return;
     }
 
     /*Normal refresh: draw the area in parts*/
-    lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp_refr);
     /*Calculate the max row num*/
     lv_coord_t w = lv_area_get_width(area_p);
     lv_coord_t h = lv_area_get_height(area_p);
     lv_coord_t y2 = area_p->y2 >= lv_disp_get_ver_res(disp_refr) ?
                     lv_disp_get_ver_res(disp_refr) - 1 : area_p->y2;
 
-    int32_t max_row = (uint32_t)draw_buf->size / w;
+    int32_t max_row = get_max_row(disp_refr, w, h);
 
-    if(max_row > h) max_row = h;
-
-    /*Round down the lines of draw_buf if rounding is added*/
-    if(disp_refr->driver->rounder_cb) {
-        lv_area_t tmp;
-        tmp.x1 = 0;
-        tmp.x2 = 0;
-        tmp.y1 = 0;
-
-        lv_coord_t h_tmp = max_row;
-        do {
-            tmp.y2 = h_tmp - 1;
-            disp_refr->driver->rounder_cb(disp_refr->driver, &tmp);
-
-            /*If this height fits into `max_row` then fine*/
-            if(lv_area_get_height(&tmp) <= max_row) break;
-
-            /*Decrement the height of the area until it fits into `max_row` after rounding*/
-            h_tmp--;
-        } while(h_tmp > 0);
-
-        if(h_tmp <= 0) {
-            LV_LOG_WARN("Can't set draw_buf height using the round function. (Wrong round_cb or to "
-                        "small draw_buf)");
-            return;
-        }
-        else {
-            max_row = tmp.y2 + 1;
-        }
+    lv_coord_t row;
+    lv_coord_t row_last = 0;
+    lv_area_t sub_area;
+    for(row = area_p->y1; row + max_row - 1 <= y2; row += max_row) {
+        /*Calc. the next y coordinates of draw_buf*/
+        sub_area.x1 = area_p->x1;
+        sub_area.x2 = area_p->x2;
+        sub_area.y1 = row;
+        sub_area.y2 = row + max_row - 1;
+        draw_ctx->buf_area = &sub_area;
+        draw_ctx->clip_area = &sub_area;
+        draw_ctx->buf = disp_refr->driver->draw_buf->buf_act;
+        if(sub_area.y2 > y2) sub_area.y2 = y2;
+        row_last = sub_area.y2;
+        if(y2 == row_last) disp_refr->driver->draw_buf->last_part = 1;
+        lv_refr_area_part(draw_ctx);
     }
 
-    /*In direct mode draw directly on the absolute coordinates of the buffer*/
-    if(disp_refr->driver->direct_mode) {
-        draw_buf->area.x1 = 0;
-        draw_buf->area.x2 = lv_disp_get_hor_res(disp_refr) - 1;
-        draw_buf->area.y1 = 0;
-        draw_buf->area.y2 = lv_disp_get_ver_res(disp_refr) - 1;
-        disp_refr->driver->draw_buf->last_part = disp_refr->driver->draw_buf->last_area;
-        lv_refr_area_part(area_p);
-    }
-    /*Else assume the buffer starts at the given area*/
-    else {
-        /*Always use the full row*/
-        lv_coord_t row;
-        lv_coord_t row_last = 0;
-        for(row = area_p->y1; row + max_row - 1 <= y2; row += max_row) {
-            /*Calc. the next y coordinates of draw_buf*/
-            draw_buf->area.x1 = area_p->x1;
-            draw_buf->area.x2 = area_p->x2;
-            draw_buf->area.y1 = row;
-            draw_buf->area.y2 = row + max_row - 1;
-            if(draw_buf->area.y2 > y2) draw_buf->area.y2 = y2;
-            row_last = draw_buf->area.y2;
-            if(y2 == row_last) disp_refr->driver->draw_buf->last_part = 1;
-            lv_refr_area_part(area_p);
-        }
-
-        /*If the last y coordinates are not handled yet ...*/
-        if(y2 != row_last) {
-            /*Calc. the next y coordinates of draw_buf*/
-            draw_buf->area.x1 = area_p->x1;
-            draw_buf->area.x2 = area_p->x2;
-            draw_buf->area.y1 = row;
-            draw_buf->area.y2 = y2;
-
-            disp_refr->driver->draw_buf->last_part = 1;
-            lv_refr_area_part(area_p);
-        }
+    /*If the last y coordinates are not handled yet ...*/
+    if(y2 != row_last) {
+        /*Calc. the next y coordinates of draw_buf*/
+        sub_area.x1 = area_p->x1;
+        sub_area.x2 = area_p->x2;
+        sub_area.y1 = row;
+        sub_area.y2 = y2;
+        draw_ctx->buf_area = &sub_area;
+        draw_ctx->clip_area = &sub_area;
+        draw_ctx->buf = disp_refr->driver->draw_buf->buf_act;
+        disp_refr->driver->draw_buf->last_part = 1;
+        lv_refr_area_part(draw_ctx);
     }
 }
 
-/**
- * Refresh a part of an area which is on the actual Virtual Display Buffer
- * @param area_p pointer to an area to refresh
- */
-static void lv_refr_area_part(const lv_area_t * area_p)
+static void lv_refr_area_part(lv_draw_ctx_t * draw_ctx)
 {
     lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp_refr);
 
@@ -517,32 +601,34 @@ static void lv_refr_area_part(const lv_area_t * area_p)
     lv_obj_t * top_act_scr = NULL;
     lv_obj_t * top_prev_scr = NULL;
 
-    /*Get the new mask from the original area and the act. draw_buf
-     It will be a part of 'area_p'*/
-    lv_area_t start_mask;
-    _lv_area_intersect(&start_mask, area_p, &draw_buf->area);
-
     /*Get the most top object which is not covered by others*/
-    top_act_scr = lv_refr_get_top_obj(&start_mask, lv_disp_get_scr_act(disp_refr));
+    top_act_scr = lv_refr_get_top_obj(draw_ctx->buf_area, lv_disp_get_scr_act(disp_refr));
     if(disp_refr->prev_scr) {
-        top_prev_scr = lv_refr_get_top_obj(&start_mask, disp_refr->prev_scr);
+        top_prev_scr = lv_refr_get_top_obj(draw_ctx->buf_area, disp_refr->prev_scr);
     }
 
     /*Draw a display background if there is no top object*/
     if(top_act_scr == NULL && top_prev_scr == NULL) {
-        if(disp_refr->bg_fn) {
-            disp_refr->bg_fn(&start_mask);
-        } else if(disp_refr->bg_img) {
-            lv_draw_img_dsc_t dsc;
-            lv_draw_img_dsc_init(&dsc);
-            dsc.opa = disp_refr->bg_opa;
+        if(draw_ctx->draw_bg) {
+            lv_draw_rect_dsc_t dsc;
+            lv_draw_rect_dsc_init(&dsc);
+            dsc.bg_img_src = disp_refr->bg_img;
+            dsc.bg_img_opa = disp_refr->bg_opa;
+            dsc.bg_color = disp_refr->bg_color;
+            dsc.bg_opa = disp_refr->bg_opa;
+            draw_ctx->draw_bg(draw_ctx, &dsc, draw_ctx->buf_area);
+        }
+        else if(disp_refr->bg_img) {
             lv_img_header_t header;
             lv_res_t res;
             res = lv_img_decoder_get_info(disp_refr->bg_img, &header);
             if(res == LV_RES_OK) {
                 lv_area_t a;
                 lv_area_set(&a, 0, 0, header.w - 1, header.h - 1);
-                lv_draw_img(&a, &start_mask, disp_refr->bg_img, &dsc);
+                lv_draw_img_dsc_t dsc;
+                lv_draw_img_dsc_init(&dsc);
+                dsc.opa = disp_refr->bg_opa;
+                lv_draw_img(draw_ctx, &dsc, &a, disp_refr->bg_img);
             }
             else {
                 LV_LOG_WARN("Can't draw the background image");
@@ -553,35 +639,26 @@ static void lv_refr_area_part(const lv_area_t * area_p)
             lv_draw_rect_dsc_init(&dsc);
             dsc.bg_color = disp_refr->bg_color;
             dsc.bg_opa = disp_refr->bg_opa;
-            lv_draw_rect(&start_mask, &start_mask, &dsc);
-
+            lv_draw_rect(draw_ctx, &dsc, draw_ctx->buf_area);
         }
     }
     /*Refresh the previous screen if any*/
     if(disp_refr->prev_scr) {
-        /*Get the most top object which is not covered by others*/
-        if(top_prev_scr == NULL) {
-            top_prev_scr = disp_refr->prev_scr;
-        }
-        /*Do the refreshing from the top object*/
-        lv_refr_obj_and_children(top_prev_scr, &start_mask);
-
+        if(top_prev_scr == NULL) top_prev_scr = disp_refr->prev_scr;
+        lv_refr_obj_and_children(draw_ctx, top_prev_scr);
     }
 
-    if(top_act_scr == NULL) {
-        top_act_scr = disp_refr->act_scr;
-    }
-    /*Do the refreshing from the top object*/
-    lv_refr_obj_and_children(top_act_scr, &start_mask);
+    if(top_act_scr == NULL) top_act_scr = disp_refr->act_scr;
+    lv_refr_obj_and_children(draw_ctx, top_act_scr);
 
     /*Also refresh top and sys layer unconditionally*/
-    lv_refr_obj_and_children(lv_disp_get_layer_top(disp_refr), &start_mask);
-    lv_refr_obj_and_children(lv_disp_get_layer_sys(disp_refr), &start_mask);
+    lv_refr_obj_and_children(draw_ctx, lv_disp_get_layer_top(disp_refr));
+    lv_refr_obj_and_children(draw_ctx, lv_disp_get_layer_sys(disp_refr));
 
     /*In true double buffered mode flush only once when all areas were rendered.
      *In normal mode flush after every area*/
     if(disp_refr->driver->full_refresh == false) {
-        draw_buf_flush();
+        draw_buf_flush(disp_refr);
     }
 }
 
@@ -595,7 +672,7 @@ static lv_obj_t * lv_refr_get_top_obj(const lv_area_t * area_p, lv_obj_t * obj)
 {
     lv_obj_t * found_p = NULL;
 
-    /*If this object is fully cover the draw area check the children too*/
+    /*If this object is fully cover the draw area then check the children too*/
     if(_lv_area_is_in(area_p, &obj->coords, 0) && lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN) == false) {
         lv_cover_check_info_t info;
         info.res = LV_COVER_RES_COVER;
@@ -631,127 +708,88 @@ static lv_obj_t * lv_refr_get_top_obj(const lv_area_t * area_p, lv_obj_t * obj)
  * @param top_p pointer to an objects. Start the drawing from it.
  * @param mask_p pointer to an area, the objects will be drawn only here
  */
-static void lv_refr_obj_and_children(lv_obj_t * top_p, const lv_area_t * mask_p)
+static void lv_refr_obj_and_children(lv_draw_ctx_t * draw_ctx, lv_obj_t * top_obj)
 {
     /*Normally always will be a top_obj (at least the screen)
      *but in special cases (e.g. if the screen has alpha) it won't.
      *In this case use the screen directly*/
-    if(top_p == NULL) top_p = lv_disp_get_scr_act(disp_refr);
-    if(top_p == NULL) return;  /*Shouldn't happen*/
+    if(top_obj == NULL) top_obj = lv_disp_get_scr_act(disp_refr);
+    if(top_obj == NULL) return;  /*Shouldn't happen*/
 
     /*Refresh the top object and its children*/
-    lv_refr_obj(top_p, mask_p);
+    lv_refr_obj(draw_ctx, top_obj);
 
     /*Draw the 'younger' sibling objects because they can be on top_obj*/
-    lv_obj_t * par;
-    lv_obj_t * border_p = top_p;
+    lv_obj_t * parent;
+    lv_obj_t * border_p = top_obj;
 
-    par = lv_obj_get_parent(top_p);
+    parent = lv_obj_get_parent(top_obj);
 
     /*Do until not reach the screen*/
-    while(par != NULL) {
+    while(parent != NULL) {
         bool go = false;
         uint32_t i;
-        uint32_t child_cnt = lv_obj_get_child_cnt(par);
+        uint32_t child_cnt = lv_obj_get_child_cnt(parent);
         for(i = 0; i < child_cnt; i++) {
-            lv_obj_t * child = par->spec_attr->children[i];
+            lv_obj_t * child = parent->spec_attr->children[i];
             if(!go) {
                 if(child == border_p) go = true;
             }
             else {
                 /*Refresh the objects*/
-                lv_refr_obj(child, mask_p);
+                lv_refr_obj(draw_ctx, child);
             }
         }
 
         /*Call the post draw draw function of the parents of the to object*/
-        lv_event_send(par, LV_EVENT_DRAW_POST_BEGIN, (void *)mask_p);
-        lv_event_send(par, LV_EVENT_DRAW_POST, (void *)mask_p);
-        lv_event_send(par, LV_EVENT_DRAW_POST_END, (void *)mask_p);
+        lv_event_send(parent, LV_EVENT_DRAW_POST_BEGIN, (void *)draw_ctx);
+        lv_event_send(parent, LV_EVENT_DRAW_POST, (void *)draw_ctx);
+        lv_event_send(parent, LV_EVENT_DRAW_POST_END, (void *)draw_ctx);
 
         /*The new border will be the last parents,
          *so the 'younger' brothers of parent will be refreshed*/
-        border_p = par;
+        border_p = parent;
         /*Go a level deeper*/
-        par = lv_obj_get_parent(par);
+        parent = lv_obj_get_parent(parent);
     }
 }
 
-/**
- * Refresh an object an all of its children. (Called recursively)
- * @param obj pointer to an object to refresh
- * @param mask_ori_p pointer to an area, the objects will be drawn only here
- */
-static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p)
+static uint32_t get_max_row(lv_disp_t * disp, lv_coord_t area_w, lv_coord_t area_h)
 {
-    /*Do not refresh hidden objects*/
-    if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return;
+    int32_t max_row = (uint32_t)disp->driver->draw_buf->size / area_w;
 
-    bool union_ok; /*Store the return value of area_union*/
-    /*Truncate the original mask to the coordinates of the parent
-     *because the parent and its children are visible only here*/
-    lv_area_t obj_mask;
-    lv_area_t obj_ext_mask;
-    lv_area_t obj_area;
-    lv_coord_t ext_size = _lv_obj_get_ext_draw_size(obj);
-    lv_obj_get_coords(obj, &obj_area);
-    obj_area.x1 -= ext_size;
-    obj_area.y1 -= ext_size;
-    obj_area.x2 += ext_size;
-    obj_area.y2 += ext_size;
-    union_ok = _lv_area_intersect(&obj_ext_mask, mask_ori_p, &obj_area);
+    if(max_row > area_h) max_row = area_h;
 
-    /*Draw the parent and its children only if they ore on 'mask_parent'*/
-    if(union_ok != false) {
-        /*Redraw the object*/
-        lv_event_send(obj, LV_EVENT_DRAW_MAIN_BEGIN, &obj_ext_mask);
-        lv_event_send(obj, LV_EVENT_DRAW_MAIN, &obj_ext_mask);
-        lv_event_send(obj, LV_EVENT_DRAW_MAIN_END, &obj_ext_mask);
+    /*Round down the lines of draw_buf if rounding is added*/
+    if(disp_refr->driver->rounder_cb) {
+        lv_area_t tmp;
+        tmp.x1 = 0;
+        tmp.x2 = 0;
+        tmp.y1 = 0;
 
-#if LV_USE_REFR_DEBUG
-        lv_color_t debug_color = lv_color_make(lv_rand(0, 0xFF), lv_rand(0, 0xFF), lv_rand(0, 0xFF));
-        lv_draw_rect_dsc_t draw_dsc;
-        lv_draw_rect_dsc_init(&draw_dsc);
-        draw_dsc.bg_color.full = debug_color.full;
-        draw_dsc.bg_opa = LV_OPA_20;
-        draw_dsc.border_width = 1;
-        draw_dsc.border_opa = LV_OPA_30;
-        draw_dsc.border_color = debug_color;
-        lv_draw_rect(&obj_ext_mask, &obj_ext_mask, &draw_dsc);
-#endif
-        /*Create a new 'obj_mask' without 'ext_size' because the children can't be visible there*/
-        lv_obj_get_coords(obj, &obj_area);
-        union_ok = _lv_area_intersect(&obj_mask, mask_ori_p, &obj_area);
-        if(union_ok != false) {
-            lv_area_t mask_child; /*Mask from obj and its child*/
-            lv_area_t child_area;
-            uint32_t i;
-            uint32_t child_cnt = lv_obj_get_child_cnt(obj);
-            for(i = 0; i < child_cnt; i++) {
-                lv_obj_t * child = obj->spec_attr->children[i];
-                lv_obj_get_coords(child, &child_area);
-                ext_size = _lv_obj_get_ext_draw_size(child);
-                child_area.x1 -= ext_size;
-                child_area.y1 -= ext_size;
-                child_area.x2 += ext_size;
-                child_area.y2 += ext_size;
-                /*Get the union (common parts) of original mask (from obj)
-                 *and its child*/
-                union_ok = _lv_area_intersect(&mask_child, &obj_mask, &child_area);
+        lv_coord_t h_tmp = max_row;
+        do {
+            tmp.y2 = h_tmp - 1;
+            disp_refr->driver->rounder_cb(disp_refr->driver, &tmp);
 
-                /*If the parent and the child has common area then refresh the child*/
-                if(union_ok) {
-                    /*Refresh the next children*/
-                    lv_refr_obj(child, &mask_child);
-                }
-            }
+            /*If this height fits into `max_row` then fine*/
+            if(lv_area_get_height(&tmp) <= max_row) break;
+
+            /*Decrement the height of the area until it fits into `max_row` after rounding*/
+            h_tmp--;
+        } while(h_tmp > 0);
+
+        if(h_tmp <= 0) {
+            LV_LOG_WARN("Can't set draw_buf height using the round function. (Wrong round_cb or to "
+                        "small draw_buf)");
+            return 0;
+        }
+        else {
+            max_row = tmp.y2 + 1;
         }
-
-        /*If all the children are redrawn make 'post draw' draw*/
-        lv_event_send(obj, LV_EVENT_DRAW_POST_BEGIN, &obj_ext_mask);
-        lv_event_send(obj, LV_EVENT_DRAW_POST, &obj_ext_mask);
-        lv_event_send(obj, LV_EVENT_DRAW_POST_END, &obj_ext_mask);
     }
+
+    return max_row;
 }
 
 static void draw_buf_rotate_180(lv_disp_drv_t * drv, lv_area_t * area, lv_color_t * color_p)
@@ -934,14 +972,13 @@ static void draw_buf_rotate(lv_area_t * area, lv_color_t * color_p)
 /**
  * Flush the content of the draw buffer
  */
-static void draw_buf_flush(void)
+static void draw_buf_flush(lv_disp_t * disp)
 {
     lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp_refr);
-    lv_color_t * color_p = draw_buf->buf_act;
 
     /*Flush the rendered content to the display*/
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    if(disp->driver->gpu_wait_cb) disp->driver->gpu_wait_cb(disp->driver);
+    lv_draw_ctx_t * draw_ctx = disp->driver->draw_ctx;
+    if(draw_ctx->wait_for_finish) draw_ctx->wait_for_finish(draw_ctx);
 
     /* In double buffered mode wait until the other buffer is freed
      * and driver is ready to receive the new buffer */
@@ -956,16 +993,19 @@ static void draw_buf_flush(void)
     if(disp_refr->driver->draw_buf->last_area && disp_refr->driver->draw_buf->last_part) draw_buf->flushing_last = 1;
     else draw_buf->flushing_last = 0;
 
+    bool flushing_last = draw_buf->flushing_last;
+
     if(disp->driver->flush_cb) {
         /*Rotate the buffer to the display's native orientation if necessary*/
         if(disp->driver->rotated != LV_DISP_ROT_NONE && disp->driver->sw_rotate) {
-            draw_buf_rotate(&draw_buf->area, draw_buf->buf_act);
+            draw_buf_rotate(draw_ctx->buf_area, draw_ctx->buf);
         }
         else {
-            call_flush_cb(disp->driver, &draw_buf->area, color_p);
+            call_flush_cb(disp->driver, draw_ctx->buf_area, draw_ctx->buf);
         }
     }
-    if(draw_buf->buf1 && draw_buf->buf2) {
+    /*If there are 2 buffers swap them. With direct mode swap only on the last area*/
+    if(draw_buf->buf1 && draw_buf->buf2 && (!disp->driver->direct_mode || flushing_last)) {
         if(draw_buf->buf_act == draw_buf->buf1)
             draw_buf->buf_act = draw_buf->buf2;
         else
@@ -987,3 +1027,26 @@ static void call_flush_cb(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_
 
     drv->flush_cb(drv, &offset_area, color_p);
 }
+
+#if LV_USE_PERF_MONITOR
+static void perf_monitor_init(perf_monitor_t * _perf_monitor)
+{
+    LV_ASSERT_NULL(_perf_monitor);
+    _perf_monitor->elaps_sum = 0;
+    _perf_monitor->fps_sum_all = 0;
+    _perf_monitor->fps_sum_cnt = 0;
+    _perf_monitor->frame_cnt = 0;
+    _perf_monitor->perf_last_time = 0;
+    _perf_monitor->perf_label = NULL;
+}
+#endif
+
+#if LV_USE_MEM_MONITOR
+static void mem_monitor_init(mem_monitor_t * _mem_monitor)
+{
+    LV_ASSERT_NULL(_mem_monitor);
+    _mem_monitor->mem_last_time = 0;
+    _mem_monitor->mem_label = NULL;
+}
+#endif
+
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_refr.h b/lib/libesp32_lvgl/lvgl/src/core/lv_refr.h
index 4ac3c2cf5..984168a96 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_refr.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_refr.h
@@ -56,6 +56,13 @@ void _lv_refr_init(void);
  */
 void lv_refr_now(lv_disp_t * disp);
 
+/**
+ * Redrawn on object an all its children using the passed draw context
+ * @param draw  pointer to an initialized draw context
+ * @param obj   the start object from the redraw should start
+ */
+void lv_refr_obj(lv_draw_ctx_t * draw_ctx, lv_obj_t * obj);
+
 /**
  * Invalidate an area on display to redraw it
  * @param area_p pointer to area which should be invalidated (NULL: delete the invalidated areas)
@@ -80,7 +87,12 @@ void _lv_refr_set_disp_refreshing(lv_disp_t * disp);
 
 #if LV_USE_PERF_MONITOR
 /**
- * Get the average FPS since start up
+ * Reset FPS counter
+ */
+void lv_refr_reset_fps_counter(void);
+
+/**
+ * Get the average FPS
  * @return the average FPS
  */
 uint32_t lv_refr_get_fps_avg(void);
diff --git a/lib/libesp32_lvgl/lvgl/src/core/lv_theme.h b/lib/libesp32_lvgl/lvgl/src/core/lv_theme.h
index f2f390728..ef46336c8 100644
--- a/lib/libesp32_lvgl/lvgl/src/core/lv_theme.h
+++ b/lib/libesp32_lvgl/lvgl/src/core/lv_theme.h
@@ -47,7 +47,7 @@ typedef struct _lv_theme_t {
 
 /**
  * Get the theme assigned to the display of the object
- * @param obj       pointer to object
+ * @param obj       pointer to a theme object
  * @return          the theme of the object's display (can be NULL)
  */
 lv_theme_t  * lv_theme_get_from_obj(lv_obj_t * obj);
@@ -77,29 +77,34 @@ void lv_theme_set_apply_cb(lv_theme_t * theme, lv_theme_apply_cb_t apply_cb);
 
 /**
  * Get the small font of the theme
+ * @param obj pointer to an object
  * @return pointer to the font
  */
 const lv_font_t * lv_theme_get_font_small(lv_obj_t * obj);
 /**
  * Get the normal font of the theme
+ * @param obj pointer to an object
  * @return pointer to the font
  */
 const lv_font_t * lv_theme_get_font_normal(lv_obj_t * obj);
 
 /**
  * Get the subtitle font of the theme
+ * @param obj pointer to an object
  * @return pointer to the font
  */
 const lv_font_t * lv_theme_get_font_large(lv_obj_t * obj);
 
 /**
  * Get the primary color of the theme
+ * @param obj pointer to an object
  * @return the color
  */
 lv_color_t lv_theme_get_color_primary(lv_obj_t * obj);
 
 /**
  * Get the secondary color of the theme
+ * @param obj pointer to an object
  * @return the color
  */
 lv_color_t lv_theme_get_color_secondary(lv_obj_t * obj);
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_sdl.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.c
similarity index 58%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_sdl.c
rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw.c
index 2b46d87c9..116e3b231 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_sdl.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.c
@@ -1,20 +1,13 @@
 /**
- * @file lv_gpu_sdl.c
+ * @file lv_draw.c
  *
  */
 
 /*********************
  *      INCLUDES
  *********************/
-
-
-#include "../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include "lv_gpu_sdl.h"
-#include "sdl/lv_gpu_sdl_utils.h"
-#include "sdl/lv_gpu_sdl_texture_cache.h"
+#include "lv_draw.h"
+#include "sw/lv_draw_sw.h"
 
 /*********************
  *      DEFINES
@@ -32,6 +25,10 @@
  *  STATIC VARIABLES
  **********************/
 
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
 /**********************
  *      MACROS
  **********************/
@@ -40,20 +37,17 @@
  *   GLOBAL FUNCTIONS
  **********************/
 
-void lv_gpu_sdl_init()
+void lv_draw_init(void)
 {
-    _lv_gpu_sdl_utils_init();
-    _lv_gpu_sdl_texture_cache_init();
+    //    backend_head = NULL;
+    //    lv_draw_sw_init();
+    //
+    //#if LV_USE_GPU_STM32_DMA2D == 0
+    //    lv_gpu_stm32_dma2d_init();
+    //#endif
 }
 
-void lv_gpu_sdl_deinit()
-{
-    _lv_gpu_sdl_texture_cache_deinit();
-    _lv_gpu_sdl_utils_deinit();
-}
 /**********************
  *   STATIC FUNCTIONS
  **********************/
 
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.h
index 7f78dc8ee..8e3c6cb94 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.h
@@ -26,7 +26,6 @@ extern "C" {
 #include "lv_draw_line.h"
 #include "lv_draw_triangle.h"
 #include "lv_draw_arc.h"
-#include "lv_draw_blend.h"
 #include "lv_draw_mask.h"
 
 /*********************
@@ -37,10 +36,72 @@ extern "C" {
  *      TYPEDEFS
  **********************/
 
+typedef struct {
+    void * user_data;
+} lv_draw_mask_t;
+
+
+typedef struct _lv_draw_ctx_t  {
+    /**
+     *  Pointer to a buffer to draw into
+     */
+    void * buf;
+
+    /**
+     * The position and size of `buf` (absolute coordinates)
+     */
+    lv_area_t * buf_area;
+
+    /**
+     * The current clip area with absolute coordinates, always the same or smaller than `buf_area`
+     */
+    const lv_area_t * clip_area;
+
+
+    void (*draw_rect)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+
+    void (*draw_arc)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center,
+                     uint16_t radius,  uint16_t start_angle, uint16_t end_angle);
+
+    void (*draw_img_decoded)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc,
+                             const lv_area_t * coords, const uint8_t * map_p, lv_img_cf_t color_format);
+
+    lv_res_t (*draw_img)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                         const lv_area_t * coords, const void * src);
+
+    void (*draw_letter)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,  const lv_point_t * pos_p,
+                        uint32_t letter);
+
+
+    void (*draw_line)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc, const lv_point_t * point1,
+                      const lv_point_t * point2);
+
+
+    void (*draw_polygon)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc,
+                         const lv_point_t * points, uint16_t point_cnt);
+
+    /**
+     * Replace the buffer with a rect without decoration like radius or borders
+     */
+    void (*draw_bg)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_area_t * coords);
+
+    /**
+     * Wait until all background operations are finished. (E.g. GPU operations)
+     */
+    void (*wait_for_finish)(struct _lv_draw_ctx_t * draw);
+
+#if LV_USE_USER_DATA
+    void * user_data;
+#endif
+
+} lv_draw_ctx_t;
+
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
+void lv_draw_init(void);
+
 /**********************
  *  GLOBAL VARIABLES
  **********************/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.mk b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.mk
index a31fedf43..803e06494 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.mk
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.mk
@@ -1,5 +1,5 @@
 CSRCS += lv_draw_arc.c
-CSRCS += lv_draw_blend.c
+CSRCS += lv_draw.c
 CSRCS += lv_draw_img.c
 CSRCS += lv_draw_label.c
 CSRCS += lv_draw_line.c
@@ -14,3 +14,5 @@ DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
 VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
 
 CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw"
+
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl/lv_draw_sdl.mk
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.c
index 44084f4d1..b806a002e 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.c
@@ -6,46 +6,20 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw.h"
 #include "lv_draw_arc.h"
-#include "lv_draw_rect.h"
-#include "lv_draw_mask.h"
-#include "../misc/lv_math.h"
-#include "../misc/lv_log.h"
-#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES
  *********************/
-#define SPLIT_RADIUS_LIMIT 10  /*With radius greater than this the arc will drawn in quarters. A quarter is drawn only if there is arc in it*/
-#define SPLIT_ANGLE_GAP_LIMIT 60  /*With small gaps in the arc don't bother with splitting because there is nothing to skip.*/
 
 /**********************
  *      TYPEDEFS
  **********************/
-typedef struct {
-    lv_coord_t center_x;
-    lv_coord_t center_y;
-    lv_coord_t radius;
-    uint16_t start_angle;
-    uint16_t end_angle;
-    uint16_t start_quarter;
-    uint16_t end_quarter;
-    lv_coord_t width;
-    lv_draw_rect_dsc_t * draw_dsc;
-    const lv_area_t * draw_area;
-    const lv_area_t * clip_area;
-} quarter_draw_dsc_t;
 
 /**********************
  *  STATIC PROTOTYPES
  **********************/
-#if LV_DRAW_COMPLEX
-    static void draw_quarter_0(quarter_draw_dsc_t * q);
-    static void draw_quarter_1(quarter_draw_dsc_t * q);
-    static void draw_quarter_2(quarter_draw_dsc_t * q);
-    static void draw_quarter_3(quarter_draw_dsc_t * q);
-    static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area);
-#endif /*LV_DRAW_COMPLEX*/
 
 /**********************
  *  STATIC VARIABLES
@@ -59,7 +33,7 @@ typedef struct {
  *   GLOBAL FUNCTIONS
  **********************/
 
-LV_ATTRIBUTE_FAST_MEM void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc)
+void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc)
 {
     lv_memset_00(dsc, sizeof(lv_draw_arc_dsc_t));
     dsc->width = 1;
@@ -67,155 +41,17 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc)
     dsc->color = lv_color_black();
 }
 
-void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius,  uint16_t start_angle, uint16_t end_angle,
-                 const lv_area_t * clip_area, const lv_draw_arc_dsc_t * dsc)
+void lv_draw_arc(lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center, uint16_t radius,
+                 uint16_t start_angle, uint16_t end_angle)
 {
-#if LV_DRAW_COMPLEX
     if(dsc->opa <= LV_OPA_MIN) return;
     if(dsc->width == 0) return;
     if(start_angle == end_angle) return;
 
-    lv_coord_t width = dsc->width;
-    if(width > radius) width = radius;
+    draw_ctx->draw_arc(draw_ctx, dsc, center, radius, start_angle, end_angle);
 
-    lv_draw_rect_dsc_t cir_dsc;
-    lv_draw_rect_dsc_init(&cir_dsc);
-    cir_dsc.blend_mode = dsc->blend_mode;
-    if(dsc->img_src) {
-        cir_dsc.bg_opa = LV_OPA_TRANSP;
-        cir_dsc.bg_img_src = dsc->img_src;
-        cir_dsc.bg_img_opa = dsc->opa;
-    }
-    else {
-        cir_dsc.bg_opa = dsc->opa;
-        cir_dsc.bg_color = dsc->color;
-    }
-
-    lv_area_t area_out;
-    area_out.x1 = center_x - radius;
-    area_out.y1 = center_y - radius;
-    area_out.x2 = center_x + radius - 1;  /*-1 because the center already belongs to the left/bottom part*/
-    area_out.y2 = center_y + radius - 1;
-
-    lv_area_t area_in;
-    lv_area_copy(&area_in, &area_out);
-    area_in.x1 += dsc->width;
-    area_in.y1 += dsc->width;
-    area_in.x2 -= dsc->width;
-    area_in.y2 -= dsc->width;
-
-    /*Create inner the mask*/
-    int16_t mask_in_id = LV_MASK_ID_INV;
-    lv_draw_mask_radius_param_t mask_in_param;
-    if(lv_area_get_width(&area_in) > 0 && lv_area_get_height(&area_in) > 0) {
-        lv_draw_mask_radius_init(&mask_in_param, &area_in, LV_RADIUS_CIRCLE, true);
-        mask_in_id = lv_draw_mask_add(&mask_in_param, NULL);
-    }
-
-    lv_draw_mask_radius_param_t mask_out_param;
-    lv_draw_mask_radius_init(&mask_out_param, &area_out, LV_RADIUS_CIRCLE, false);
-    int16_t mask_out_id = lv_draw_mask_add(&mask_out_param, NULL);
-
-    /*Draw a full ring*/
-    if(start_angle + 360 == end_angle || start_angle == end_angle + 360) {
-        cir_dsc.radius = LV_RADIUS_CIRCLE;
-        lv_draw_rect(&area_out, clip_area, &cir_dsc);
-
-        lv_draw_mask_remove_id(mask_out_id);
-        if(mask_in_id != LV_MASK_ID_INV) lv_draw_mask_remove_id(mask_in_id);
-        return;
-    }
-
-    while(start_angle >= 360) start_angle -= 360;
-    while(end_angle >= 360) end_angle -= 360;
-
-    lv_draw_mask_angle_param_t mask_angle_param;
-    lv_draw_mask_angle_init(&mask_angle_param, center_x, center_y, start_angle, end_angle);
-    int16_t mask_angle_id = lv_draw_mask_add(&mask_angle_param, NULL);
-
-    int32_t angle_gap;
-    if(end_angle > start_angle) {
-        angle_gap = 360 - (end_angle - start_angle);
-    }
-    else {
-        angle_gap = start_angle - end_angle;
-    }
-    if(angle_gap > SPLIT_ANGLE_GAP_LIMIT && radius > SPLIT_RADIUS_LIMIT) {
-        /*Handle each quarter individually and skip which is empty*/
-        quarter_draw_dsc_t q_dsc;
-        q_dsc.center_x = center_x;
-        q_dsc.center_y = center_y;
-        q_dsc.radius = radius;
-        q_dsc.start_angle = start_angle;
-        q_dsc.end_angle = end_angle;
-        q_dsc.start_quarter = (start_angle / 90) & 0x3;
-        q_dsc.end_quarter = (end_angle / 90) & 0x3;
-        q_dsc.width = width;
-        q_dsc.draw_dsc =  &cir_dsc;
-        q_dsc.draw_area = &area_out;
-        q_dsc.clip_area = clip_area;
-
-        draw_quarter_0(&q_dsc);
-        draw_quarter_1(&q_dsc);
-        draw_quarter_2(&q_dsc);
-        draw_quarter_3(&q_dsc);
-    }
-    else {
-        lv_draw_rect(&area_out, clip_area, &cir_dsc);
-    }
-
-    lv_draw_mask_free_param(&mask_angle_param);
-    lv_draw_mask_free_param(&mask_out_param);
-    lv_draw_mask_free_param(&mask_in_param);
-
-    lv_draw_mask_remove_id(mask_angle_id);
-    lv_draw_mask_remove_id(mask_out_id);
-    if(mask_in_id != LV_MASK_ID_INV) lv_draw_mask_remove_id(mask_in_id);
-
-    if(dsc->rounded) {
-
-        lv_draw_mask_radius_param_t mask_end_param;
-
-        lv_area_t round_area;
-        get_rounded_area(start_angle, radius, width, &round_area);
-        round_area.x1 += center_x;
-        round_area.x2 += center_x;
-        round_area.y1 += center_y;
-        round_area.y2 += center_y;
-        lv_area_t clip_area2;
-        if(_lv_area_intersect(&clip_area2, clip_area, &round_area)) {
-            lv_draw_mask_radius_init(&mask_end_param, &round_area, LV_RADIUS_CIRCLE, false);
-            int16_t mask_end_id = lv_draw_mask_add(&mask_end_param, NULL);
-
-            lv_draw_rect(&area_out, &clip_area2, &cir_dsc);
-            lv_draw_mask_remove_id(mask_end_id);
-            lv_draw_mask_free_param(&mask_end_param);
-        }
-
-        get_rounded_area(end_angle, radius, width, &round_area);
-        round_area.x1 += center_x;
-        round_area.x2 += center_x;
-        round_area.y1 += center_y;
-        round_area.y2 += center_y;
-        if(_lv_area_intersect(&clip_area2, clip_area, &round_area)) {
-            lv_draw_mask_radius_init(&mask_end_param, &round_area, LV_RADIUS_CIRCLE, false);
-            int16_t mask_end_id = lv_draw_mask_add(&mask_end_param, NULL);
-
-            lv_draw_rect(&area_out, &clip_area2, &cir_dsc);
-            lv_draw_mask_remove_id(mask_end_id);
-            lv_draw_mask_free_param(&mask_end_param);
-        }
-    }
-#else
-    LV_LOG_WARN("Can't draw arc with LV_DRAW_COMPLEX == 0");
-    LV_UNUSED(center_x);
-    LV_UNUSED(center_y);
-    LV_UNUSED(radius);
-    LV_UNUSED(start_angle);
-    LV_UNUSED(end_angle);
-    LV_UNUSED(clip_area);
-    LV_UNUSED(dsc);
-#endif /*LV_DRAW_COMPLEX*/
+    //    const lv_draw_backend_t * backend = lv_draw_backend_get();
+    //    backend->draw_arc(center_x, center_y, radius, start_angle, end_angle, clip_area, dsc);
 }
 
 void lv_draw_arc_get_area(lv_coord_t x, lv_coord_t y, uint16_t radius,  uint16_t start_angle, uint16_t end_angle,
@@ -314,256 +150,3 @@ void lv_draw_arc_get_area(lv_coord_t x, lv_coord_t y, uint16_t radius,  uint16_t
 /**********************
  *   STATIC FUNCTIONS
  **********************/
-
-#if LV_DRAW_COMPLEX
-static void draw_quarter_0(quarter_draw_dsc_t * q)
-{
-    lv_area_t quarter_area;
-
-    if(q->start_quarter == 0 && q->end_quarter == 0 && q->start_angle < q->end_angle) {
-        /*Small arc here*/
-        quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-        quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-        quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->end_angle) * q->radius) >> LV_TRIGO_SHIFT);
-        quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-    else if(q->start_quarter == 0 || q->end_quarter == 0) {
-        /*Start and/or end arcs here*/
-        if(q->start_quarter == 0) {
-            quarter_area.x1 = q->center_x;
-            quarter_area.y2 = q->center_y + q->radius;
-
-            quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-            quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-        if(q->end_quarter == 0) {
-            quarter_area.x2 = q->center_x + q->radius;
-            quarter_area.y1 = q->center_y;
-
-            quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->end_angle) * q->radius) >> LV_TRIGO_SHIFT);
-            quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-    }
-    else if((q->start_quarter == q->end_quarter && q->start_quarter != 0 && q->end_angle < q->start_angle) ||
-            (q->start_quarter == 2 && q->end_quarter == 1) ||
-            (q->start_quarter == 3 && q->end_quarter == 2) ||
-            (q->start_quarter == 3 && q->end_quarter == 1)) {
-        /*Arc crosses here*/
-        quarter_area.x1 = q->center_x;
-        quarter_area.y1 = q->center_y;
-        quarter_area.x2 = q->center_x + q->radius;
-        quarter_area.y2 = q->center_y + q->radius;
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-}
-
-static void draw_quarter_1(quarter_draw_dsc_t * q)
-{
-    lv_area_t quarter_area;
-
-    if(q->start_quarter == 1 && q->end_quarter == 1 && q->start_angle < q->end_angle) {
-        /*Small arc here*/
-        quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
-        quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-        quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-        quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-    else if(q->start_quarter == 1 || q->end_quarter == 1) {
-        /*Start and/or end arcs here*/
-        if(q->start_quarter == 1) {
-            quarter_area.x1 = q->center_x - q->radius;
-            quarter_area.y1 = q->center_y;
-
-            quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
-            quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-        if(q->end_quarter == 1) {
-            quarter_area.x2 = q->center_x - 1;
-            quarter_area.y2 = q->center_y + q->radius;
-
-            quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-            quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-    }
-    else if((q->start_quarter == q->end_quarter && q->start_quarter != 1 && q->end_angle < q->start_angle) ||
-            (q->start_quarter == 0 && q->end_quarter == 2) ||
-            (q->start_quarter == 0 && q->end_quarter == 3) ||
-            (q->start_quarter == 3 && q->end_quarter == 2)) {
-        /*Arc crosses here*/
-        quarter_area.x1 = q->center_x - q->radius;
-        quarter_area.y1 = q->center_y;
-        quarter_area.x2 = q->center_x - 1;
-        quarter_area.y2 = q->center_y + q->radius;
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-}
-
-static void draw_quarter_2(quarter_draw_dsc_t * q)
-{
-    lv_area_t quarter_area;
-
-    if(q->start_quarter == 2 && q->end_quarter == 2 && q->start_angle < q->end_angle) {
-        /*Small arc here*/
-        quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-        quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-        quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->end_angle) * q->radius) >> LV_TRIGO_SHIFT);
-        quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-    else if(q->start_quarter == 2 || q->end_quarter == 2) {
-        /*Start and/or end arcs here*/
-        if(q->start_quarter == 2) {
-            quarter_area.x2 = q->center_x - 1;
-            quarter_area.y1 = q->center_y - q->radius;
-
-            quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-            quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-        if(q->end_quarter == 2) {
-            quarter_area.x1 = q->center_x - q->radius;
-            quarter_area.y2 = q->center_y - 1;
-
-            quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-            quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->end_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-    }
-    else if((q->start_quarter == q->end_quarter && q->start_quarter != 2 && q->end_angle < q->start_angle) ||
-            (q->start_quarter == 0 && q->end_quarter == 3) ||
-            (q->start_quarter == 1 && q->end_quarter == 3) ||
-            (q->start_quarter == 1 && q->end_quarter == 0)) {
-        /*Arc crosses here*/
-        quarter_area.x1 = q->center_x - q->radius;
-        quarter_area.y1 = q->center_y - q->radius;
-        quarter_area.x2 = q->center_x - 1;
-        quarter_area.y2 = q->center_y - 1;
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-}
-
-static void draw_quarter_3(quarter_draw_dsc_t * q)
-{
-    lv_area_t quarter_area;
-
-    if(q->start_quarter == 3 && q->end_quarter == 3 && q->start_angle < q->end_angle) {
-        /*Small arc here*/
-        quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-        quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-        quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-        quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-    else if(q->start_quarter == 3 || q->end_quarter == 3) {
-        /*Start and/or end arcs here*/
-        if(q->start_quarter == 3) {
-            quarter_area.x2 = q->center_x + q->radius;
-            quarter_area.y2 = q->center_y - 1;
-
-            quarter_area.x1 = q->center_x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-            quarter_area.y1 = q->center_y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-        if(q->end_quarter == 3) {
-            quarter_area.x1 = q->center_x;
-            quarter_area.y1 = q->center_y - q->radius;
-
-            quarter_area.x2 = q->center_x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
-            quarter_area.y2 = q->center_y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
-
-            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-            if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-        }
-    }
-    else if((q->start_quarter == q->end_quarter && q->start_quarter != 3 && q->end_angle < q->start_angle) ||
-            (q->start_quarter == 2 && q->end_quarter == 0) ||
-            (q->start_quarter == 1 && q->end_quarter == 0) ||
-            (q->start_quarter == 2 && q->end_quarter == 1)) {
-        /*Arc crosses here*/
-        quarter_area.x1 = q->center_x;
-        quarter_area.y1 = q->center_y - q->radius;
-        quarter_area.x2 = q->center_x + q->radius;
-        quarter_area.y2 = q->center_y - 1;
-
-        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
-        if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
-    }
-}
-
-static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area)
-{
-    const uint8_t ps = 8;
-    const uint8_t pa = 127;
-
-    int32_t thick_half = thickness / 2;
-    uint8_t thick_corr = (thickness & 0x01) ? 0 : 1;
-
-    int32_t cir_x;
-    int32_t cir_y;
-
-    cir_x = ((radius - thick_half) * lv_trigo_sin(90 - angle)) >> (LV_TRIGO_SHIFT - ps);
-    cir_y = ((radius - thick_half) * lv_trigo_sin(angle)) >> (LV_TRIGO_SHIFT - ps);
-
-    /*Actually the center of the pixel need to be calculated so apply 1/2 px offset*/
-    if(cir_x > 0) {
-        cir_x = (cir_x - pa) >> ps;
-        res_area->x1 = cir_x - thick_half + thick_corr;
-        res_area->x2 = cir_x + thick_half;
-    }
-    else {
-        cir_x = (cir_x + pa) >> ps;
-        res_area->x1 = cir_x - thick_half;
-        res_area->x2 = cir_x + thick_half - thick_corr;
-    }
-
-    if(cir_y > 0) {
-        cir_y = (cir_y - pa) >> ps;
-        res_area->y1 = cir_y - thick_half + thick_corr;
-        res_area->y2 = cir_y + thick_half;
-    }
-    else {
-        cir_y = (cir_y + pa) >> ps;
-        res_area->y1 = cir_y - thick_half;
-        res_area->y2 = cir_y + thick_half - thick_corr;
-    }
-}
-
-#endif /*LV_DRAW_COMPLEX*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.h
index 8868b0fe9..8783f131b 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.h
@@ -13,7 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw_line.h"
+#include "../lv_conf_internal.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_style.h"
 
 /*********************
  *      DEFINES
@@ -25,17 +28,21 @@ extern "C" {
 typedef struct {
     lv_color_t color;
     lv_coord_t width;
+    uint16_t start_angle;
+    uint16_t end_angle;
     const void * img_src;
     lv_opa_t opa;
     lv_blend_mode_t blend_mode  : 2;
     uint8_t rounded : 1;
 } lv_draw_arc_dsc_t;
 
+struct _lv_draw_ctx_t;
+
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
-LV_ATTRIBUTE_FAST_MEM void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc);
+void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc);
 
 /**
  * Draw an arc. (Can draw pie too with great thickness.)
@@ -48,8 +55,8 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc);
  * @param clip_area     the arc will be drawn only in this area
  * @param dsc           pointer to an initialized `lv_draw_line_dsc_t` variable
  */
-void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius,  uint16_t start_angle, uint16_t end_angle,
-                 const lv_area_t * clip_area, const lv_draw_arc_dsc_t * dsc);
+void lv_draw_arc(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center,
+                 uint16_t radius,  uint16_t start_angle, uint16_t end_angle);
 
 /**
  * Get an area the should be invalidated when the arcs angle changed between start_angle and end_ange
@@ -73,4 +80,4 @@ void lv_draw_arc_get_area(lv_coord_t x, lv_coord_t y, uint16_t radius,  uint16_t
 } /*extern "C"*/
 #endif
 
-#endif /*LV_DRAW_ARC*/
+#endif /*LV_DRAW_ARC_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.c
deleted file mode 100644
index 4d26160e3..000000000
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.c
+++ /dev/null
@@ -1,1063 +0,0 @@
-/**
- * @file lv_draw_blend.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_draw_blend.h"
-#include "lv_img_decoder.h"
-#include "../misc/lv_math.h"
-#include "../hal/lv_hal_disp.h"
-#include "../core/lv_refr.h"
-
-#if LV_USE_GPU_NXP_PXP
-    #include "../gpu/lv_gpu_nxp_pxp.h"
-#elif LV_USE_GPU_NXP_VG_LITE
-    #include "../gpu/lv_gpu_nxp_vglite.h"
-#elif LV_USE_GPU_STM32_DMA2D
-    #include "../gpu/lv_gpu_stm32_dma2d.h"
-#endif
-
-/*********************
- *      DEFINES
- *********************/
-#define GPU_SIZE_LIMIT      240
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-#if LV_USE_EXTERNAL_RENDERER == 0
-static void fill_set_px(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                        lv_color_t color, lv_opa_t opa,
-                        const lv_opa_t * mask, lv_draw_mask_res_t mask_res);
-
-LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_color_t * disp_buf,
-                                              const lv_area_t * draw_area,
-                                              lv_color_t color, lv_opa_t opa,
-                                              const lv_opa_t * mask, lv_draw_mask_res_t mask_res);
-
-#if LV_DRAW_COMPLEX
-static void fill_blended(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                         lv_color_t color, lv_opa_t opa,
-                         const lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_blend_mode_t mode);
-#endif
-
-static void map_set_px(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                       const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t opa,
-                       const lv_opa_t * mask, lv_draw_mask_res_t mask_res);
-
-LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_color_t * disp_buf,
-                                             const lv_area_t * draw_area,
-                                             const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t opa,
-                                             const lv_opa_t * mask, lv_draw_mask_res_t mask_res);
-
-#if LV_DRAW_COMPLEX
-static void map_blended(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                        const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t opa,
-                        const lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_blend_mode_t mode);
-
-static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color_t bg, lv_opa_t opa);
-static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_color_t bg, lv_opa_t opa);
-static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color_t bg, lv_opa_t opa);
-#endif
-#endif //LV_USE_GPU_SDL_RENDER
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-#if LV_COLOR_SCREEN_TRANSP == 0
-#define FILL_NORMAL_MASK_PX(color)                                                          \
-    if(*mask == LV_OPA_COVER) *disp_buf_first = color;                                 \
-    else *disp_buf_first = lv_color_mix(color, *disp_buf_first, *mask);            \
-    mask++;                                                         \
-    disp_buf_first++;
-
-#else
-#define FILL_NORMAL_MASK_PX(color)                                               \
-    if(*mask == LV_OPA_COVER) *disp_buf_first = color;                                 \
-    else if(disp->driver->screen_transp) lv_color_mix_with_alpha(*disp_buf_first, disp_buf_first->ch.alpha, color, *mask, disp_buf_first, &disp_buf_first->ch.alpha);           \
-    else *disp_buf_first = lv_color_mix(color, *disp_buf_first, *mask);            \
-    mask++;                                                         \
-    disp_buf_first++;
-#endif
-
-#define MAP_NORMAL_MASK_PX(x)                                                          \
-    if(*mask_tmp_x) {          \
-        if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[x] = map_buf_first[x];                                 \
-        else disp_buf_first[x] = lv_color_mix(map_buf_first[x], disp_buf_first[x], *mask_tmp_x);            \
-    }                                                                                               \
-    mask_tmp_x++;
-
-#define MAP_NORMAL_MASK_PX_SCR_TRANSP(x)                        \
-    if(*mask_tmp_x) {          \
-        if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[x] = map_buf_first[x];                                 \
-        else if(disp->driver->screen_transp) lv_color_mix_with_alpha(disp_buf_first[x], disp_buf_first[x].ch.alpha,              \
-                                                                         map_buf_first[x], *mask_tmp_x, &disp_buf_first[x], &disp_buf_first[x].ch.alpha);                  \
-        else disp_buf_first[x] = lv_color_mix(map_buf_first[x], disp_buf_first[x], *mask_tmp_x);            \
-    }                                                                                               \
-    mask_tmp_x++;
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-#if LV_USE_EXTERNAL_RENDERER == 0
-/**
- * Fill and area in the display buffer.
- * @param clip_area clip the fill to this area  (absolute coordinates)
- * @param fill_area fill this area  (absolute coordinates) (should be clipped)
- * @param color fill color
- * @param mask a mask to apply on the fill (uint8_t array with 0x00..0xff values).
- *             Relative to fill area but its width is truncated to clip area.
- * @param mask_res LV_MASK_RES_COVER: the mask has only 0xff values (no mask),
- *                 LV_MASK_RES_TRANSP: the mask has only 0x00 values (full transparent),
- *                 LV_MASK_RES_CHANGED: the mask has mixed values
- * @param opa overall opacity in 0x00..0xff range
- * @param mode blend mode from `lv_blend_mode_t`
- */
-LV_ATTRIBUTE_FAST_MEM void _lv_blend_fill(const lv_area_t * clip_area, const lv_area_t * fill_area,
-                                          lv_color_t color, lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa,
-                                          lv_blend_mode_t mode)
-{
-    /*Do not draw transparent things*/
-    if(opa < LV_OPA_MIN) return;
-    if(mask_res == LV_DRAW_MASK_RES_TRANSP) return;
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-    const lv_area_t * disp_area = &draw_buf->area;
-    lv_color_t * disp_buf = draw_buf->buf_act;
-
-    if(disp->driver->gpu_wait_cb) disp->driver->gpu_wait_cb(disp->driver);
-
-    /*Get clipped fill area which is the real draw area.
-     *It is always the same or inside `fill_area`*/
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, clip_area, fill_area)) return;
-
-    /*Now `draw_area` has absolute coordinates.
-     *Make it relative to `disp_area` to simplify the drawing to `disp_buf`*/
-    lv_area_move(&draw_area, -disp_area->x1, -disp_area->y1);
-
-    /*Round the values in the mask if anti-aliasing is disabled*/
-    if(mask && disp->driver->antialiasing == 0 && mask) {
-        int32_t mask_w = lv_area_get_width(&draw_area);
-        int32_t i;
-        for(i = 0; i < mask_w; i++)  mask[i] = mask[i] > 128 ? LV_OPA_COVER : LV_OPA_TRANSP;
-    }
-
-    if(disp->driver->set_px_cb) {
-        fill_set_px(disp_area, disp_buf, &draw_area, color, opa, mask, mask_res);
-    }
-    else if(mode == LV_BLEND_MODE_NORMAL) {
-        fill_normal(disp_area, disp_buf, &draw_area, color, opa, mask, mask_res);
-    }
-#if LV_DRAW_COMPLEX
-    else {
-        fill_blended(disp_area, disp_buf, &draw_area, color, opa, mask, mask_res, mode);
-    }
-#endif
-}
-
-/**
- * Copy a map (image) to a display buffer.
- * @param clip_area clip the map to this area (absolute coordinates)
- * @param map_area area of the image  (absolute coordinates)
- * @param map_buf a pixels of the map (image)
- * @param mask a mask to apply on every pixel (uint8_t array with 0x00..0xff values).
- *                Relative to map area but its width is truncated to clip area.
- * @param mask_res LV_MASK_RES_COVER: the mask has only 0xff values (no mask),
- *                 LV_MASK_RES_TRANSP: the mask has only 0x00 values (full transparent),
- *                 LV_MASK_RES_CHANGED: the mask has mixed values
- * @param opa  overall opacity in 0x00..0xff range
- * @param mode blend mode from `lv_blend_mode_t`
- */
-LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_area_t * map_area,
-                                         const lv_color_t * map_buf,
-                                         lv_opa_t * mask, lv_draw_mask_res_t mask_res,
-                                         lv_opa_t opa, lv_blend_mode_t mode)
-{
-    /*Do not draw transparent things*/
-    if(opa < LV_OPA_MIN) return;
-    if(mask_res == LV_DRAW_MASK_RES_TRANSP) return;
-
-    /*Get clipped fill area which is the real draw area.
-     *It is always the same or inside `fill_area`*/
-    lv_area_t draw_area;
-    bool is_common;
-    is_common = _lv_area_intersect(&draw_area, clip_area, map_area);
-    if(!is_common) return;
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-    const lv_area_t * disp_area = &draw_buf->area;
-    lv_color_t * disp_buf = draw_buf->buf_act;
-
-    if(disp->driver->gpu_wait_cb) disp->driver->gpu_wait_cb(disp->driver);
-
-    /*Now `draw_area` has absolute coordinates.
-     *Make it relative to `disp_area` to simplify draw to `disp_buf`*/
-    draw_area.x1 -= disp_area->x1;
-    draw_area.y1 -= disp_area->y1;
-    draw_area.x2 -= disp_area->x1;
-    draw_area.y2 -= disp_area->y1;
-
-    /*Round the values in the mask if anti-aliasing is disabled*/
-    if(mask && disp->driver->antialiasing == 0) {
-        int32_t mask_w = lv_area_get_width(&draw_area);
-        int32_t i;
-        for(i = 0; i < mask_w; i++)  mask[i] = mask[i] > 128 ? LV_OPA_COVER : LV_OPA_TRANSP;
-    }
-    if(disp->driver->set_px_cb) {
-        map_set_px(disp_area, disp_buf, &draw_area, map_area, map_buf, opa, mask, mask_res);
-    }
-    else if(mode == LV_BLEND_MODE_NORMAL) {
-        map_normal(disp_area, disp_buf, &draw_area, map_area, map_buf, opa, mask, mask_res);
-    }
-#if LV_DRAW_COMPLEX
-    else {
-        map_blended(disp_area, disp_buf, &draw_area, map_area, map_buf, opa, mask, mask_res, mode);
-    }
-#endif
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-static void fill_set_px(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                        lv_color_t color, lv_opa_t opa,
-                        const lv_opa_t * mask, lv_draw_mask_res_t mask_res)
-{
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-
-    /*Get the width of the `disp_area` it will be used to go to the next line*/
-    int32_t disp_w = lv_area_get_width(disp_area);
-
-    int32_t x;
-    int32_t y;
-
-    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) {
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                disp->driver->set_px_cb(disp->driver, (void *)disp_buf, disp_w, x, y, color, opa);
-            }
-        }
-    }
-    else {
-        /*The mask is relative to the clipped area.
-         *In the cycles below mask will be indexed from `draw_area.x1`
-         *but it corresponds to zero index. So prepare `mask_tmp` accordingly.*/
-        const lv_opa_t * mask_tmp = mask - draw_area->x1;
-
-        /*Get the width of the `draw_area` it will be used to go to the next line of the mask*/
-        int32_t draw_area_w = lv_area_get_width(draw_area);
-
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                if(mask_tmp[x]) {
-                    disp->driver->set_px_cb(disp->driver, (void *)disp_buf, disp_w, x, y, color,
-                                            (uint32_t)((uint32_t)opa * mask_tmp[x]) >> 8);
-                }
-            }
-            mask_tmp += draw_area_w;
-        }
-    }
-}
-
-#if LV_USE_EXTERNAL_RENDERER == 0
-/**
- * Fill an area with a color
- * @param disp_area the current display area (destination area)
- * @param disp_buf destination buffer
- * @param draw_area fill this area (relative to `disp_area`)
- * @param color fill color
- * @param opa overall opacity in 0x00..0xff range
- * @param mask a mask to apply on every pixel (uint8_t array with 0x00..0xff values).
- *                It fits into draw_area.
- * @param mask_res LV_MASK_RES_COVER: the mask has only 0xff values (no mask),
- *                 LV_MASK_RES_TRANSP: the mask has only 0x00 values (full transparent),
- *                 LV_MASK_RES_CHANGED: the mask has mixed values
- */
-LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_color_t * disp_buf,
-                                              const lv_area_t * draw_area,
-                                              lv_color_t color, lv_opa_t opa,
-                                              const lv_opa_t * mask, lv_draw_mask_res_t mask_res)
-{
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-
-    /*Get the width of the `disp_area` it will be used to go to the next line*/
-    int32_t disp_w = lv_area_get_width(disp_area);
-
-    int32_t draw_area_w = lv_area_get_width(draw_area);
-    int32_t draw_area_h = lv_area_get_height(draw_area);
-
-    /*Create a temp. disp_buf which always point to the first pixel of the destination area*/
-    lv_color_t * disp_buf_first = disp_buf + disp_w * draw_area->y1 + draw_area->x1;
-
-    int32_t x;
-    int32_t y;
-
-    /*Simple fill (maybe with opacity), no masking*/
-    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) {
-        if(opa > LV_OPA_MAX) {
-#if LV_USE_GPU_NXP_PXP
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_PXP_FILL_SIZE_LIMIT) {
-                lv_gpu_nxp_pxp_fill(disp_buf, disp_w, draw_area, color, opa);
-                return;
-            }
-#elif LV_USE_GPU_NXP_VG_LITE
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_VG_LITE_FILL_SIZE_LIMIT) {
-                if(lv_gpu_nxp_vglite_fill(disp_buf, disp_w, lv_area_get_height(disp_area), draw_area, color, opa) == LV_RES_OK) {
-                    return;
-                }
-            }
-#elif LV_USE_GPU_STM32_DMA2D
-            if(lv_area_get_size(draw_area) >= 240) {
-                lv_gpu_stm32_dma2d_fill(disp_buf_first, disp_w, color, draw_area_w, draw_area_h);
-                return;
-            }
-#endif
-
-            if(disp->driver->gpu_fill_cb && lv_area_get_size(draw_area) > GPU_SIZE_LIMIT) {
-                disp->driver->gpu_fill_cb(disp->driver, disp_buf, disp_w, draw_area, color);
-                return;
-            }
-
-            /*Software rendering*/
-            for(y = 0; y < draw_area_h; y++) {
-                lv_color_fill(disp_buf_first, color, draw_area_w);
-                disp_buf_first += disp_w;
-            }
-        }
-        /*No mask with opacity*/
-        else {
-#if LV_USE_GPU_NXP_PXP
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_PXP_FILL_OPA_SIZE_LIMIT) {
-                lv_gpu_nxp_pxp_fill(disp_buf, disp_w, draw_area, color, opa);
-                return;
-            }
-#elif LV_USE_GPU_NXP_VG_LITE
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_VG_LITE_FILL_OPA_SIZE_LIMIT) {
-                if(lv_gpu_nxp_vglite_fill(disp_buf, disp_w, lv_area_get_height(disp_area), draw_area, color, opa) == LV_RES_OK) {
-                    return;
-                }
-                /*Fall down to SW render in case of error*/
-            }
-#endif
-            lv_color_t last_dest_color = lv_color_black();
-            lv_color_t last_res_color = lv_color_mix(color, last_dest_color, opa);
-
-            uint16_t color_premult[3];
-            lv_color_premult(color, opa, color_premult);
-            lv_opa_t opa_inv = 255 - opa;
-
-            for(y = 0; y < draw_area_h; y++) {
-                for(x = 0; x < draw_area_w; x++) {
-                    if(last_dest_color.full != disp_buf_first[x].full) {
-                        last_dest_color = disp_buf_first[x];
-
-#if LV_COLOR_SCREEN_TRANSP
-                        if(disp->driver->screen_transp) {
-                            lv_color_mix_with_alpha(disp_buf_first[x], disp_buf_first[x].ch.alpha, color, opa, &last_res_color,
-                                                    &last_res_color.ch.alpha);
-                        }
-                        else
-#endif
-                        {
-                            last_res_color = lv_color_mix_premult(color_premult, disp_buf_first[x], opa_inv);
-                        }
-                    }
-                    disp_buf_first[x] = last_res_color;
-                }
-                disp_buf_first += disp_w;
-            }
-        }
-    }
-    /*Masked*/
-    else {
-        int32_t x_end4 = draw_area_w - 4;
-
-#if LV_COLOR_DEPTH == 16
-        uint32_t c32 = color.full + ((uint32_t)color.full << 16);
-#endif
-
-        /*Only the mask matters*/
-        if(opa > LV_OPA_MAX) {
-            for(y = 0; y < draw_area_h; y++) {
-                for(x = 0; x < draw_area_w && ((lv_uintptr_t)(mask) & 0x3); x++) {
-                    FILL_NORMAL_MASK_PX(color)
-                }
-
-                for(; x <= x_end4; x += 4) {
-                    uint32_t mask32 = *((uint32_t *)mask);
-                    if(mask32 == 0xFFFFFFFF) {
-#if LV_COLOR_DEPTH == 16
-                        if((lv_uintptr_t)disp_buf_first & 0x3) {
-                            *(disp_buf_first + 0) = color;
-                            uint32_t * d = (uint32_t *)(disp_buf_first + 1);
-                            *d = c32;
-                            *(disp_buf_first + 3) = color;
-                        }
-                        else {
-                            uint32_t * d = (uint32_t *)disp_buf_first;
-                            *d = c32;
-                            *(d + 1) = c32;
-                        }
-#else
-                        disp_buf_first[0] = color;
-                        disp_buf_first[1] = color;
-                        disp_buf_first[2] = color;
-                        disp_buf_first[3] = color;
-#endif
-                        disp_buf_first += 4;
-                        mask += 4;
-                    }
-                    else if(mask32) {
-                        FILL_NORMAL_MASK_PX(color)
-                        FILL_NORMAL_MASK_PX(color)
-                        FILL_NORMAL_MASK_PX(color)
-                        FILL_NORMAL_MASK_PX(color)
-                    }
-                    else {
-                        mask += 4;
-                        disp_buf_first += 4;
-                    }
-                }
-
-                for(; x < draw_area_w ; x++) {
-                    FILL_NORMAL_MASK_PX(color)
-                }
-                disp_buf_first += (disp_w - draw_area_w);
-            }
-        }
-        /*Handle opa and mask values too*/
-        else {
-            /*Buffer the result color to avoid recalculating the same color*/
-            lv_color_t last_dest_color;
-            lv_color_t last_res_color;
-            lv_opa_t last_mask = LV_OPA_TRANSP;
-            last_dest_color.full = disp_buf_first[0].full;
-            last_res_color.full = disp_buf_first[0].full;
-            lv_opa_t opa_tmp = LV_OPA_TRANSP;
-
-            for(y = draw_area->y1; y <= draw_area->y2; y++) {
-                const lv_opa_t * mask_tmp_x = mask;
-                for(x = 0; x < draw_area_w; x++) {
-                    if(*mask_tmp_x) {
-                        if(*mask_tmp_x != last_mask) opa_tmp = *mask_tmp_x == LV_OPA_COVER ? opa :
-                                                                   (uint32_t)((uint32_t)(*mask_tmp_x) * opa) >> 8;
-                        if(*mask_tmp_x != last_mask || last_dest_color.full != disp_buf_first[x].full) {
-#if LV_COLOR_SCREEN_TRANSP
-                            if(disp->driver->screen_transp) {
-                                lv_color_mix_with_alpha(disp_buf_first[x], disp_buf_first[x].ch.alpha, color, opa_tmp, &last_res_color,
-                                                        &last_res_color.ch.alpha);
-                            }
-                            else
-#endif
-                            {
-                                if(opa_tmp == LV_OPA_COVER) last_res_color = color;
-                                else last_res_color = lv_color_mix(color, disp_buf_first[x], opa_tmp);
-                            }
-                            last_mask = *mask_tmp_x;
-                            last_dest_color.full = disp_buf_first[x].full;
-                        }
-                        disp_buf_first[x] = last_res_color;
-                    }
-                    mask_tmp_x++;
-                }
-                disp_buf_first += disp_w;
-                mask += draw_area_w;
-            }
-        }
-    }
-}
-
-#if LV_DRAW_COMPLEX
-/**
- * Fill an area with a color but apply blending algorithms
- * @param disp_area the current display area (destination area)
- * @param disp_buf destination buffer
- * @param draw_area fill this area (relative to `disp_area`)
- * @param color fill color
- * @param opa overall opacity in 0x00..0xff range
- * @param mask a mask to apply on every pixel (uint8_t array with 0x00..0xff values).
- *                It fits into draw_area.
- * @param mask_res LV_MASK_RES_COVER: the mask has only 0xff values (no mask),
- *                 LV_MASK_RES_TRANSP: the mask has only 0x00 values (full transparent),
- *                 LV_MASK_RES_CHANGED: the mask has mixed values
- * @param mode blend mode from `lv_blend_mode_t`
- */
-static void fill_blended(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                         lv_color_t color, lv_opa_t opa,
-                         const lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_blend_mode_t mode)
-{
-    /*Get the width of the `disp_area` it will be used to go to the next line*/
-    int32_t disp_w = lv_area_get_width(disp_area);
-
-    /*Create a temp. disp_buf which always point to current line to draw*/
-    lv_color_t * disp_buf_tmp = disp_buf + disp_w * draw_area->y1;
-
-    lv_color_t (*blend_fp)(lv_color_t, lv_color_t, lv_opa_t);
-    switch(mode) {
-        case LV_BLEND_MODE_ADDITIVE:
-            blend_fp = color_blend_true_color_additive;
-            break;
-        case LV_BLEND_MODE_SUBTRACTIVE:
-            blend_fp = color_blend_true_color_subtractive;
-            break;
-        case LV_BLEND_MODE_MULTIPLY:
-            blend_fp = color_blend_true_color_multiply;
-            break;
-        default:
-            LV_LOG_WARN("fill_blended: unsupported blend mode");
-            return;
-    }
-
-    int32_t x;
-    int32_t y;
-
-    /*Simple fill (maybe with opacity), no masking*/
-    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) {
-        lv_color_t last_dest_color = lv_color_black();
-        lv_color_t last_res_color = lv_color_mix(color, last_dest_color, opa);
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                if(last_dest_color.full != disp_buf_tmp[x].full) {
-                    last_dest_color = disp_buf_tmp[x];
-                    last_res_color = blend_fp(color, disp_buf_tmp[x], opa);
-                }
-                disp_buf_tmp[x] = last_res_color;
-            }
-            disp_buf_tmp += disp_w;
-        }
-    }
-    /*Masked*/
-    else {
-        /*Get the width of the `draw_area` it will be used to go to the next line of the mask*/
-        int32_t draw_area_w = lv_area_get_width(draw_area);
-
-        /*The mask is relative to the clipped area.
-         *In the cycles below mask will be indexed from `draw_area.x1`
-         *but it corresponds to zero index. So prepare `mask_tmp` accordingly.*/
-        const lv_opa_t * mask_tmp = mask - draw_area->x1;
-
-        /*Buffer the result color to avoid recalculating the same color*/
-        lv_color_t last_dest_color;
-        lv_color_t last_res_color;
-        lv_opa_t last_mask = LV_OPA_TRANSP;
-        last_dest_color.full = disp_buf_tmp[0].full;
-        last_res_color.full = disp_buf_tmp[0].full;
-
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                if(mask_tmp[x] == 0) continue;
-                if(mask_tmp[x] != last_mask || last_dest_color.full != disp_buf_tmp[x].full) {
-                    lv_opa_t opa_tmp = mask_tmp[x] >= LV_OPA_MAX ? opa : (uint32_t)((uint32_t)mask_tmp[x] * opa) >> 8;
-
-                    last_res_color = blend_fp(color, disp_buf_tmp[x], opa_tmp);
-                    last_mask = mask_tmp[x];
-                    last_dest_color.full = disp_buf_tmp[x].full;
-                }
-                disp_buf_tmp[x] = last_res_color;
-            }
-            disp_buf_tmp += disp_w;
-            mask_tmp += draw_area_w;
-        }
-    }
-}
-#endif
-#endif // LV_USE_GPU_SDL_RENDER
-
-static void map_set_px(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                       const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t opa,
-                       const lv_opa_t * mask, lv_draw_mask_res_t mask_res)
-
-{
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-
-    /*Get the width of the `disp_area` it will be used to go to the next line*/
-    int32_t disp_w = lv_area_get_width(disp_area);
-
-    /*Get the width of the `draw_area` it will be used to go to the next line of the mask*/
-    int32_t draw_area_w = lv_area_get_width(draw_area);
-
-    /*Get the width of the `mask_area` it will be used to go to the next line*/
-    int32_t map_w = lv_area_get_width(map_area);
-
-    /*Create a temp. map_buf which always point to current line to draw*/
-    const lv_color_t * map_buf_tmp = map_buf + map_w * (draw_area->y1 - (map_area->y1 - disp_area->y1));
-
-    map_buf_tmp += (draw_area->x1 - (map_area->x1 - disp_area->x1));
-    map_buf_tmp -= draw_area->x1;
-    int32_t x;
-    int32_t y;
-
-    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) {
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                disp->driver->set_px_cb(disp->driver, (void *)disp_buf, disp_w, x, y, map_buf_tmp[x], opa);
-            }
-            map_buf_tmp += map_w;
-        }
-    }
-    else {
-        /*The mask is relative to the clipped area.
-         *In the cycles below mask will be indexed from `draw_area.x1`
-         *but it corresponds to zero index. So prepare `mask_tmp` accordingly.*/
-        const lv_opa_t * mask_tmp = mask - draw_area->x1;
-
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                if(mask_tmp[x]) {
-                    disp->driver->set_px_cb(disp->driver, (void *)disp_buf, disp_w, x, y, map_buf_tmp[x],
-                                            (uint32_t)((uint32_t)opa * mask_tmp[x]) >> 8);
-                }
-            }
-            mask_tmp += draw_area_w;
-            map_buf_tmp += map_w;
-        }
-    }
-}
-
-/**
- * Copy an image to an area
- * @param disp_area the current display area (destination area)
- * @param disp_buf destination buffer
- * @param map_area coordinates of the map (image) to copy. (absolute coordinates)
- * @param map_buf the pixel of the image
- * @param opa overall opacity in 0x00..0xff range
- * @param mask a mask to apply on every pixel (uint8_t array with 0x00..0xff values).
- *                It fits into draw_area.
- * @param mask_res LV_MASK_RES_COVER: the mask has only 0xff values (no mask),
- *                 LV_MASK_RES_TRANSP: the mask has only 0x00 values (full transparent),
- *                 LV_MASK_RES_CHANGED: the mask has mixed values
- */
-LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_color_t * disp_buf,
-                                             const lv_area_t * draw_area,
-                                             const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t opa,
-                                             const lv_opa_t * mask, lv_draw_mask_res_t mask_res)
-{
-
-    /*Get the width of the `disp_area` it will be used to go to the next line*/
-    int32_t disp_w = lv_area_get_width(disp_area);
-
-    int32_t draw_area_w = lv_area_get_width(draw_area);
-    int32_t draw_area_h = lv_area_get_height(draw_area);
-
-    /*Get the width of the `mask_area` it will be used to go to the next line*/
-    int32_t map_w = lv_area_get_width(map_area);
-
-    /*Create a temp. disp_buf which always point to first pixel to draw*/
-    lv_color_t * disp_buf_first = disp_buf + disp_w * draw_area->y1 + draw_area->x1;
-
-    /*Create a temp. map_buf which always point to first pixel to draw from the map*/
-    const lv_color_t * map_buf_first = map_buf + map_w * (draw_area->y1 - (map_area->y1 - disp_area->y1));
-    map_buf_first += (draw_area->x1 - (map_area->x1 - disp_area->x1));
-
-#if LV_COLOR_SCREEN_TRANSP
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-#endif
-
-    int32_t x;
-    int32_t y;
-
-    /*Simple fill (maybe with opacity), no masking*/
-    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) {
-        if(opa > LV_OPA_MAX) {
-#if LV_USE_GPU_NXP_PXP
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_PXP_BLIT_SIZE_LIMIT) {
-                lv_gpu_nxp_pxp_blit(disp_buf_first, disp_w, map_buf_first, map_w, draw_area_w, draw_area_h, opa);
-                return;
-            }
-#elif (LV_USE_GPU_NXP_VG_LITE)
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_VG_LITE_BLIT_SIZE_LIMIT) {
-
-                lv_gpu_nxp_vglite_blit_info_t blit;
-
-                blit.src = map_buf;
-                blit.src_width = draw_area_w;
-                blit.src_height = draw_area_h;
-                blit.src_stride = lv_area_get_width(map_area) * sizeof(lv_color_t);
-                blit.src_area.x1 = (draw_area->x1 - (map_area->x1 - disp_area->x1));
-                blit.src_area.y1 = (draw_area->y1 - (map_area->y1 - disp_area->y1));
-                blit.src_area.x2 = blit.src_area.x1 + draw_area_w;
-                blit.src_area.y2 = blit.src_area.y1 + draw_area_h;
-
-                blit.dst = disp_buf;
-                blit.dst_width = lv_area_get_width(disp_area);
-                blit.dst_height = lv_area_get_height(disp_area);
-                blit.dst_stride = lv_area_get_width(disp_area) * sizeof(lv_color_t);
-                blit.dst_area.x1 = draw_area->x1;
-                blit.dst_area.y1 = draw_area->y1;
-                blit.dst_area.x2 = blit.dst_area.x1 + draw_area_w;
-                blit.dst_area.y2 = blit.dst_area.y1 + draw_area_h;
-
-                blit.opa = opa;
-
-                if(lv_gpu_nxp_vglite_blit(&blit) == LV_RES_OK) {
-                    return;
-                }
-                /*Fall down to SW render in case of error*/
-            }
-#elif LV_USE_GPU_STM32_DMA2D
-            if(lv_area_get_size(draw_area) >= 240) {
-                lv_gpu_stm32_dma2d_copy(disp_buf_first, disp_w, map_buf_first, map_w, draw_area_w, draw_area_h);
-                return;
-            }
-#endif
-
-            /*Software rendering*/
-            for(y = 0; y < draw_area_h; y++) {
-                lv_memcpy(disp_buf_first, map_buf_first, draw_area_w * sizeof(lv_color_t));
-                disp_buf_first += disp_w;
-                map_buf_first += map_w;
-            }
-        }
-        else {
-#if LV_USE_GPU_NXP_PXP
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_PXP_BLIT_OPA_SIZE_LIMIT) {
-                lv_gpu_nxp_pxp_blit(disp_buf_first, disp_w, map_buf_first, map_w, draw_area_w, draw_area_h, opa);
-                return;
-            }
-#elif (LV_USE_GPU_NXP_VG_LITE)
-            if(lv_area_get_size(draw_area) >= LV_GPU_NXP_VG_LITE_BLIT_OPA_SIZE_LIMIT) {
-
-                lv_gpu_nxp_vglite_blit_info_t blit;
-
-                blit.src = map_buf;
-                blit.src_width = lv_area_get_width(map_area);
-                blit.src_height = lv_area_get_height(map_area);
-                blit.src_stride = lv_area_get_width(map_area) * sizeof(lv_color_t);
-                blit.src_area.x1 = (draw_area->x1 - (map_area->x1 - disp_area->x1));
-                blit.src_area.y1 = (draw_area->y1 - (map_area->y1 - disp_area->y1));
-                blit.src_area.x2 = blit.src_area.x1 + draw_area_w;
-                blit.src_area.y2 = blit.src_area.y1 + draw_area_h;
-
-                blit.dst = disp_buf;
-                blit.dst_width = lv_area_get_width(disp_area);
-                blit.dst_height = lv_area_get_height(disp_area);
-                blit.dst_stride = lv_area_get_width(disp_area) * sizeof(lv_color_t);
-                blit.dst_area.x1 = draw_area->x1;
-                blit.dst_area.y1 = draw_area->y1;
-                blit.dst_area.x2 = blit.dst_area.x1 + draw_area_w;
-                blit.dst_area.y2 = blit.dst_area.y1 + draw_area_h;
-
-                blit.opa = opa;
-
-                if(lv_gpu_nxp_vglite_blit(&blit) == LV_RES_OK) {
-                    return;
-                }
-                /*Fall down to SW render in case of error*/
-            }
-#elif LV_USE_GPU_STM32_DMA2D
-            if(lv_area_get_size(draw_area) >= 240) {
-                lv_gpu_stm32_dma2d_blend(disp_buf_first, disp_w, map_buf_first, opa, map_w, draw_area_w, draw_area_h);
-                return;
-            }
-#endif
-
-            /*Software rendering*/
-
-            for(y = 0; y < draw_area_h; y++) {
-                for(x = 0; x < draw_area_w; x++) {
-#if LV_COLOR_SCREEN_TRANSP
-                    if(disp->driver->screen_transp) {
-                        lv_color_mix_with_alpha(disp_buf_first[x], disp_buf_first[x].ch.alpha, map_buf_first[x], opa, &disp_buf_first[x],
-                                                &disp_buf_first[x].ch.alpha);
-                    }
-                    else
-#endif
-                    {
-                        disp_buf_first[x] = lv_color_mix(map_buf_first[x], disp_buf_first[x], opa);
-                    }
-                }
-                disp_buf_first += disp_w;
-                map_buf_first += map_w;
-            }
-        }
-    }
-    /*Masked*/
-    else {
-        /*Only the mask matters*/
-        if(opa > LV_OPA_MAX) {
-            /*Go to the first pixel of the row*/
-
-            int32_t x_end4 = draw_area_w - 4;
-
-            for(y = 0; y < draw_area_h; y++) {
-                const lv_opa_t * mask_tmp_x = mask;
-#if 0
-                for(x = 0; x < draw_area_w; x++) {
-                    MAP_NORMAL_MASK_PX(x);
-                }
-#else
-                for(x = 0; x < draw_area_w && ((lv_uintptr_t)mask_tmp_x & 0x3); x++) {
-#if LV_COLOR_SCREEN_TRANSP
-                    MAP_NORMAL_MASK_PX_SCR_TRANSP(x)
-#else
-                    MAP_NORMAL_MASK_PX(x)
-#endif
-                }
-
-                uint32_t * mask32 = (uint32_t *)mask_tmp_x;
-                for(; x < x_end4; x += 4) {
-                    if(*mask32) {
-                        if((*mask32) == 0xFFFFFFFF) {
-                            disp_buf_first[x] = map_buf_first[x];
-                            disp_buf_first[x + 1] = map_buf_first[x + 1];
-                            disp_buf_first[x + 2] = map_buf_first[x + 2];
-                            disp_buf_first[x + 3] = map_buf_first[x + 3];
-                        }
-                        else {
-                            mask_tmp_x = (const lv_opa_t *)mask32;
-#if LV_COLOR_SCREEN_TRANSP
-                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x)
-                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x + 1)
-                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x + 2)
-                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x + 3)
-#else
-                            MAP_NORMAL_MASK_PX(x)
-                            MAP_NORMAL_MASK_PX(x + 1)
-                            MAP_NORMAL_MASK_PX(x + 2)
-                            MAP_NORMAL_MASK_PX(x + 3)
-#endif
-                        }
-                    }
-                    mask32++;
-                }
-
-                mask_tmp_x = (const lv_opa_t *)mask32;
-                for(; x < draw_area_w ; x++) {
-#if LV_COLOR_SCREEN_TRANSP
-                    MAP_NORMAL_MASK_PX_SCR_TRANSP(x)
-#else
-                    MAP_NORMAL_MASK_PX(x)
-#endif
-                }
-#endif
-                disp_buf_first += disp_w;
-                mask += draw_area_w;
-                map_buf_first += map_w;
-            }
-        }
-        /*Handle opa and mask values too*/
-        else {
-            for(y = 0; y < draw_area_h; y++) {
-                for(x = 0; x < draw_area_w; x++) {
-                    if(mask[x]) {
-                        lv_opa_t opa_tmp = mask[x] >= LV_OPA_MAX ? opa : ((opa * mask[x]) >> 8);
-#if LV_COLOR_SCREEN_TRANSP
-                        if(disp->driver->screen_transp) {
-                            lv_color_mix_with_alpha(disp_buf_first[x], disp_buf_first[x].ch.alpha, map_buf_first[x], opa_tmp, &disp_buf_first[x],
-                                                    &disp_buf_first[x].ch.alpha);
-                        }
-                        else
-#endif
-                        {
-                            disp_buf_first[x] = lv_color_mix(map_buf_first[x], disp_buf_first[x], opa_tmp);
-                        }
-                    }
-                }
-                disp_buf_first += disp_w;
-                mask += draw_area_w;
-                map_buf_first += map_w;
-            }
-        }
-    }
-}
-#if LV_DRAW_COMPLEX
-static void map_blended(const lv_area_t * disp_area, lv_color_t * disp_buf,  const lv_area_t * draw_area,
-                        const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t opa,
-                        const lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_blend_mode_t mode)
-{
-
-    /*Get the width of the `disp_area` it will be used to go to the next line*/
-    int32_t disp_w = lv_area_get_width(disp_area);
-
-    /*Get the width of the `draw_area` it will be used to go to the next line of the mask*/
-    int32_t draw_area_w = lv_area_get_width(draw_area);
-
-    /*Get the width of the `mask_area` it will be used to go to the next line*/
-    int32_t map_w = lv_area_get_width(map_area);
-
-    /*Create a temp. disp_buf which always point to current line to draw*/
-    lv_color_t * disp_buf_tmp = disp_buf + disp_w * draw_area->y1;
-
-    /*Create a temp. map_buf which always point to current line to draw*/
-    const lv_color_t * map_buf_tmp = map_buf + map_w * (draw_area->y1 - (map_area->y1 - disp_area->y1));
-
-    lv_color_t (*blend_fp)(lv_color_t, lv_color_t, lv_opa_t);
-    switch(mode) {
-        case LV_BLEND_MODE_ADDITIVE:
-            blend_fp = color_blend_true_color_additive;
-            break;
-        case LV_BLEND_MODE_SUBTRACTIVE:
-            blend_fp = color_blend_true_color_subtractive;
-            break;
-        case LV_BLEND_MODE_MULTIPLY:
-            blend_fp = color_blend_true_color_multiply;
-            break;
-        default:
-            LV_LOG_WARN("fill_blended: unsupported blend mode");
-            return;
-    }
-
-    int32_t x;
-    int32_t y;
-
-    /*Simple fill (maybe with opacity), no masking*/
-    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) {
-        /*Go to the first px of the row*/
-        map_buf_tmp += (draw_area->x1 - (map_area->x1 - disp_area->x1));
-
-        /*The map will be indexed from `draw_area->x1` so compensate it.*/
-        map_buf_tmp -= draw_area->x1;
-
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                disp_buf_tmp[x] = blend_fp(map_buf_tmp[x], disp_buf_tmp[x], opa);
-            }
-            disp_buf_tmp += disp_w;
-            map_buf_tmp += map_w;
-        }
-    }
-    /*Masked*/
-    else {
-        /*The mask is relative to the clipped area.
-         *In the cycles below mask will be indexed from `draw_area.x1`
-         *but it corresponds to zero index. So prepare `mask_tmp` accordingly.*/
-        const lv_opa_t * mask_tmp = mask - draw_area->x1;
-
-        map_buf_tmp -= draw_area->x1;
-        for(y = draw_area->y1; y <= draw_area->y2; y++) {
-            for(x = draw_area->x1; x <= draw_area->x2; x++) {
-                if(mask_tmp[x] == 0) continue;
-                lv_opa_t opa_tmp = mask_tmp[x] >= LV_OPA_MAX ? opa : ((opa * mask_tmp[x]) >> 8);
-                disp_buf_tmp[x] = blend_fp(map_buf_tmp[x], disp_buf_tmp[x], opa_tmp);
-            }
-            disp_buf_tmp += disp_w;
-            mask_tmp += draw_area_w;
-            map_buf_tmp += map_w;
-        }
-    }
-}
-
-static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color_t bg, lv_opa_t opa)
-{
-
-    if(opa <= LV_OPA_MIN) return bg;
-
-    uint32_t tmp;
-#if LV_COLOR_DEPTH == 1
-    tmp = bg.full + fg.full;
-    fg.full = LV_MIN(tmp, 1);
-#else
-    tmp = bg.ch.red + fg.ch.red;
-#if LV_COLOR_DEPTH == 8
-    fg.ch.red = LV_MIN(tmp, 7);
-#elif LV_COLOR_DEPTH == 16
-    fg.ch.red = LV_MIN(tmp, 31);
-#elif LV_COLOR_DEPTH == 32
-    fg.ch.red = LV_MIN(tmp, 255);
-#endif
-
-#if LV_COLOR_DEPTH == 8
-    tmp = bg.ch.green + fg.ch.green;
-    fg.ch.green = LV_MIN(tmp, 7);
-#elif LV_COLOR_DEPTH == 16
-#if LV_COLOR_16_SWAP == 0
-    tmp = bg.ch.green + fg.ch.green;
-    fg.ch.green = LV_MIN(tmp, 63);
-#else
-    tmp = (bg.ch.green_h << 3) + bg.ch.green_l + (fg.ch.green_h << 3) + fg.ch.green_l;
-    tmp = LV_MIN(tmp, 63);
-    fg.ch.green_h = tmp >> 3;
-    fg.ch.green_l = tmp & 0x7;
-#endif
-
-#elif LV_COLOR_DEPTH == 32
-    tmp = bg.ch.green + fg.ch.green;
-    fg.ch.green = LV_MIN(tmp, 255);
-#endif
-
-    tmp = bg.ch.blue + fg.ch.blue;
-#if LV_COLOR_DEPTH == 8
-    fg.ch.blue = LV_MIN(tmp, 4);
-#elif LV_COLOR_DEPTH == 16
-    fg.ch.blue = LV_MIN(tmp, 31);
-#elif LV_COLOR_DEPTH == 32
-    fg.ch.blue = LV_MIN(tmp, 255);
-#endif
-#endif
-
-    if(opa == LV_OPA_COVER) return fg;
-
-    return lv_color_mix(fg, bg, opa);
-}
-
-static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_color_t bg, lv_opa_t opa)
-{
-    if(opa <= LV_OPA_MIN) return bg;
-
-    int32_t tmp;
-    tmp = bg.ch.red - fg.ch.red;
-    fg.ch.red = LV_MAX(tmp, 0);
-
-#if LV_COLOR_16_SWAP == 0
-    tmp = bg.ch.green - fg.ch.green;
-    fg.ch.green = LV_MAX(tmp, 0);
-#else
-    tmp = (bg.ch.green_h << 3) + bg.ch.green_l + (fg.ch.green_h << 3) + fg.ch.green_l;
-    tmp = LV_MAX(tmp, 0);
-    fg.ch.green_h = tmp >> 3;
-    fg.ch.green_l = tmp & 0x7;
-#endif
-
-    tmp = bg.ch.blue - fg.ch.blue;
-    fg.ch.blue = LV_MAX(tmp, 0);
-
-    if(opa == LV_OPA_COVER) return fg;
-
-    return lv_color_mix(fg, bg, opa);
-}
-
-static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color_t bg, lv_opa_t opa)
-{
-    if(opa <= LV_OPA_MIN) return bg;
-
-#if LV_COLOR_DEPTH == 32
-    fg.ch.red = (fg.ch.red * bg.ch.red) >> 8;
-    fg.ch.green = (fg.ch.green * bg.ch.green) >> 8;
-    fg.ch.blue = (fg.ch.blue * bg.ch.blue) >> 8;
-#elif LV_COLOR_DEPTH == 16
-    fg.ch.red = (fg.ch.red * bg.ch.red) >> 5;
-    fg.ch.blue = (fg.ch.blue * bg.ch.blue) >> 5;
-    LV_COLOR_SET_G(fg, (LV_COLOR_GET_G(fg) * LV_COLOR_GET_G(bg)) >> 6);
-#elif LV_COLOR_DEPTH == 8
-    fg.ch.red = (fg.ch.red * bg.ch.red) >> 3;
-    fg.ch.green = (fg.ch.green * bg.ch.green) >> 3;
-    fg.ch.blue = (fg.ch.blue * bg.ch.blue) >> 2;
-#endif
-
-    if(opa == LV_OPA_COVER) return fg;
-
-    return lv_color_mix(fg, bg, opa);
-}
-
-#endif
-
-#endif // LV_USE_GPU_SDL_RENDER
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.h
deleted file mode 100644
index a2002f628..000000000
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @file lv_draw_blend.h
- *
- */
-
-#ifndef LV_DRAW_BLEND_H
-#define LV_DRAW_BLEND_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "../misc/lv_color.h"
-#include "../misc/lv_area.h"
-#include "../misc/lv_style.h"
-#include "lv_draw_mask.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-//! @cond Doxygen_Suppress
-LV_ATTRIBUTE_FAST_MEM void _lv_blend_fill(const lv_area_t * clip_area, const lv_area_t * fill_area, lv_color_t color,
-                                          lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode);
-
-LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_area_t * map_area,
-                                         const lv_color_t * map_buf,
-                                         lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode);
-
-//! @endcond
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_DRAW_BLEND_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.c
index 35ece92d1..320913255 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.c
@@ -13,11 +13,6 @@
 #include "../core/lv_refr.h"
 #include "../misc/lv_mem.h"
 #include "../misc/lv_math.h"
-#if LV_USE_GPU_STM32_DMA2D
-    #include "../gpu/lv_gpu_stm32_dma2d.h"
-#elif LV_USE_GPU_NXP_PXP
-    #include "../gpu/lv_gpu_nxp_pxp.h"
-#endif
 
 /*********************
  *      DEFINES
@@ -30,19 +25,11 @@
 /**********************
  *  STATIC PROTOTYPES
  **********************/
-#if LV_USE_EXTERNAL_RENDERER == 0
-LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords, const lv_area_t * clip_area,
-                                                       const void * src,
-                                                       const lv_draw_img_dsc_t * draw_dsc);
+LV_ATTRIBUTE_FAST_MEM static lv_res_t decode_and_draw(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                                                      const lv_area_t * coords, const void * src);
 
-LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const lv_area_t * clip_area,
-                                              const uint8_t * map_p,
-                                              const lv_draw_img_dsc_t * draw_dsc,
-                                              bool chroma_key, bool alpha_byte);
-
-static void show_error(const lv_area_t * coords, const lv_area_t * clip_area, const char * msg);
+static void show_error(lv_draw_ctx_t * draw_ctx, const lv_area_t * coords, const char * msg);
 static void draw_cleanup(_lv_img_cache_entry_t * cache);
-#endif
 
 /**********************
  *  STATIC VARIABLES
@@ -65,7 +52,6 @@ void lv_draw_img_dsc_init(lv_draw_img_dsc_t * dsc)
     dsc->antialias = LV_COLOR_DEPTH > 8 ? 1 : 0;
 }
 
-#if LV_USE_EXTERNAL_RENDERER == 0
 /**
  * Draw an image
  * @param coords the coordinates of the image
@@ -73,26 +59,30 @@ void lv_draw_img_dsc_init(lv_draw_img_dsc_t * dsc)
  * @param src pointer to a lv_color_t array which contains the pixels of the image
  * @param dsc pointer to an initialized `lv_draw_img_dsc_t` variable
  */
-void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void * src, const lv_draw_img_dsc_t * dsc)
+void lv_draw_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc, const lv_area_t * coords, const void * src)
 {
     if(src == NULL) {
         LV_LOG_WARN("Image draw: src is NULL");
-        show_error(coords, mask, "No\ndata");
+        show_error(draw_ctx, coords, "No\ndata");
         return;
     }
 
     if(dsc->opa <= LV_OPA_MIN) return;
 
     lv_res_t res;
-    res = lv_img_draw_core(coords, mask, src, dsc);
+    if(draw_ctx->draw_img) {
+        res = draw_ctx->draw_img(draw_ctx, dsc, coords, src);
+    }
+    else {
+        res = decode_and_draw(draw_ctx, dsc, coords, src);
+    }
 
     if(res == LV_RES_INV) {
         LV_LOG_WARN("Image draw error");
-        show_error(coords, mask, "No\ndata");
+        show_error(draw_ctx, coords, "No\ndata");
         return;
     }
 }
-#endif //LV_USE_GPU_SDL_RENDER
 
 /**
  * Get the pixel size of a color format in bits
@@ -151,10 +141,6 @@ bool lv_img_cf_is_chroma_keyed(lv_img_cf_t cf)
     switch(cf) {
         case LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED:
         case LV_IMG_CF_RAW_CHROMA_KEYED:
-        case LV_IMG_CF_INDEXED_1BIT:
-        case LV_IMG_CF_INDEXED_2BIT:
-        case LV_IMG_CF_INDEXED_4BIT:
-        case LV_IMG_CF_INDEXED_8BIT:
             is_chroma_keyed = true;
             break;
 
@@ -229,14 +215,20 @@ lv_img_src_t lv_img_src_get_type(const void * src)
     return img_src_type;
 }
 
+void lv_draw_img_decoded(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc,
+                         const lv_area_t * coords, const uint8_t * map_p, lv_img_cf_t color_format)
+{
+    if(draw_ctx->draw_img_decoded == NULL) return;
+
+    draw_ctx->draw_img_decoded(draw_ctx, dsc, coords, map_p, color_format);
+}
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
 
-#if LV_USE_EXTERNAL_RENDERER == 0
-LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords, const lv_area_t * clip_area,
-                                                       const void * src,
-                                                       const lv_draw_img_dsc_t * draw_dsc)
+LV_ATTRIBUTE_FAST_MEM static lv_res_t decode_and_draw(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                                                      const lv_area_t * coords, const void * src)
 {
     if(draw_dsc->opa <= LV_OPA_MIN) return LV_RES_OK;
 
@@ -244,13 +236,16 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
 
     if(cdsc == NULL) return LV_RES_INV;
 
-    bool chroma_keyed = lv_img_cf_is_chroma_keyed(cdsc->dec_dsc.header.cf);
-    bool alpha_byte   = lv_img_cf_has_alpha(cdsc->dec_dsc.header.cf);
+
+    lv_img_cf_t cf;
+    if(lv_img_cf_is_chroma_keyed(cdsc->dec_dsc.header.cf)) cf = LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED;
+    else if(lv_img_cf_has_alpha(cdsc->dec_dsc.header.cf)) cf = LV_IMG_CF_TRUE_COLOR_ALPHA;
+    else cf = LV_IMG_CF_TRUE_COLOR;
 
     if(cdsc->dec_dsc.error_msg != NULL) {
         LV_LOG_WARN("Image draw error");
 
-        show_error(coords, clip_area, cdsc->dec_dsc.error_msg);
+        show_error(draw_ctx, coords, cdsc->dec_dsc.error_msg);
     }
     /*The decoder could open the image and gave the entire uncompressed image.
      *Just draw it!*/
@@ -269,22 +264,25 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
             map_area_rot.y2 += coords->y1;
         }
 
-        lv_area_t mask_com; /*Common area of mask and coords*/
+        lv_area_t clip_com; /*Common area of mask and coords*/
         bool union_ok;
-        union_ok = _lv_area_intersect(&mask_com, clip_area, &map_area_rot);
+        union_ok = _lv_area_intersect(&clip_com, draw_ctx->clip_area, &map_area_rot);
         /*Out of mask. There is nothing to draw so the image is drawn successfully.*/
         if(union_ok == false) {
             draw_cleanup(cdsc);
             return LV_RES_OK;
         }
 
-        lv_draw_map(coords, &mask_com, cdsc->dec_dsc.img_data, draw_dsc, chroma_keyed, alpha_byte);
+        const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+        draw_ctx->clip_area = &clip_com;
+        lv_draw_img_decoded(draw_ctx, draw_dsc, coords, cdsc->dec_dsc.img_data, cf);
+        draw_ctx->clip_area = clip_area_ori;
     }
     /*The whole uncompressed image is not available. Try to read it line-by-line*/
     else {
         lv_area_t mask_com; /*Common area of mask and coords*/
         bool union_ok;
-        union_ok = _lv_area_intersect(&mask_com, clip_area, coords);
+        union_ok = _lv_area_intersect(&mask_com, draw_ctx->clip_area, coords);
         /*Out of mask. There is nothing to draw so the image is drawn successfully.*/
         if(union_ok == false) {
             draw_cleanup(cdsc);
@@ -296,6 +294,7 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
         uint8_t  * buf = lv_mem_buf_get(lv_area_get_width(&mask_com) *
                                         LV_IMG_PX_SIZE_ALPHA_BYTE);  /*+1 because of the possible alpha byte*/
 
+        const lv_area_t * clip_area_ori = draw_ctx->clip_area;
         lv_area_t line;
         lv_area_copy(&line, &mask_com);
         lv_area_set_height(&line, 1);
@@ -305,7 +304,7 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
         lv_res_t read_res;
         for(row = mask_com.y1; row <= mask_com.y2; row++) {
             lv_area_t mask_line;
-            union_ok = _lv_area_intersect(&mask_line, clip_area, &line);
+            union_ok = _lv_area_intersect(&mask_line, clip_area_ori, &line);
             if(union_ok == false) continue;
 
             read_res = lv_img_decoder_read_line(&cdsc->dec_dsc, x, y, width, buf);
@@ -314,14 +313,17 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
                 LV_LOG_WARN("Image draw can't read the line");
                 lv_mem_buf_release(buf);
                 draw_cleanup(cdsc);
+                draw_ctx->clip_area = clip_area_ori;
                 return LV_RES_INV;
             }
 
-            lv_draw_map(&line, &mask_line, buf, draw_dsc, chroma_keyed, alpha_byte);
+            draw_ctx->clip_area = &mask_line;
+            lv_draw_img_decoded(draw_ctx, draw_dsc, &line, buf, cf);
             line.y1++;
             line.y2++;
             y++;
         }
+        draw_ctx->clip_area = clip_area_ori;
         lv_mem_buf_release(buf);
     }
 
@@ -329,330 +331,17 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
     return LV_RES_OK;
 }
 
-/**
- * Draw a color map to the display (image)
- * @param map_area coordinates the color map
- * @param clip_area the map will drawn only on this area  (truncated to draw_buf area)
- * @param map_p pointer to a lv_color_t array
- * @param draw_dsc pointer to an initialized `lv_draw_img_dsc_t` variable
- * @param chroma_key true: enable transparency of LV_IMG_LV_COLOR_TRANSP color pixels
- * @param alpha_byte true: extra alpha byte is inserted for every pixel
- */
-LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const lv_area_t * clip_area,
-                                              const uint8_t * map_p,
-                                              const lv_draw_img_dsc_t * draw_dsc,
-                                              bool chroma_key, bool alpha_byte)
-{
-    /*Use the clip area as draw area*/
-    lv_area_t draw_area;
-    lv_area_copy(&draw_area, clip_area);
 
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-    const lv_area_t * disp_area = &draw_buf->area;
-
-    /*Now `draw_area` has absolute coordinates.
-     *Make it relative to `disp_area` to simplify draw to `disp_buf`*/
-    draw_area.x1 -= disp_area->x1;
-    draw_area.y1 -= disp_area->y1;
-    draw_area.x2 -= disp_area->x1;
-    draw_area.y2 -= disp_area->y1;
-
-    bool mask_any = lv_draw_mask_is_any(clip_area);
-
-    /*The simplest case just copy the pixels into the draw_buf*/
-    if(!mask_any && draw_dsc->angle == 0 && draw_dsc->zoom == LV_IMG_ZOOM_NONE &&
-       chroma_key == false && alpha_byte == false && draw_dsc->recolor_opa == LV_OPA_TRANSP) {
-        _lv_blend_map(clip_area, map_area, (lv_color_t *)map_p, NULL, LV_DRAW_MASK_RES_FULL_COVER, draw_dsc->opa,
-                      draw_dsc->blend_mode);
-    }
-
-#if LV_USE_GPU_NXP_PXP
-    /*Simple case without masking and transformations*/
-    else if(!mask_any && draw_dsc->angle == 0 && draw_dsc->zoom == LV_IMG_ZOOM_NONE && alpha_byte == false &&
-            chroma_key == true && draw_dsc->recolor_opa == LV_OPA_TRANSP) { /*copy with color keying (+ alpha)*/
-        lv_gpu_nxp_pxp_enable_color_key();
-        _lv_blend_map(clip_area, map_area, (lv_color_t *)map_p, NULL, LV_DRAW_MASK_RES_FULL_COVER, draw_dsc->opa,
-                      draw_dsc->blend_mode);
-        lv_gpu_nxp_pxp_disable_color_key();
-    }
-    else if(!mask_any && draw_dsc->angle == 0 && draw_dsc->zoom == LV_IMG_ZOOM_NONE && alpha_byte == false &&
-            chroma_key == false && draw_dsc->recolor_opa != LV_OPA_TRANSP) { /*copy with recolor (+ alpha)*/
-        lv_gpu_nxp_pxp_enable_recolor(draw_dsc->recolor, draw_dsc->recolor_opa);
-        _lv_blend_map(clip_area, map_area, (lv_color_t *)map_p, NULL, LV_DRAW_MASK_RES_FULL_COVER, draw_dsc->opa,
-                      draw_dsc->blend_mode);
-        lv_gpu_nxp_pxp_disable_recolor();
-    }
-#endif
-    /*In the other cases every pixel need to be checked one-by-one*/
-    else {
-        //#if LV_DRAW_COMPLEX
-        /*The pixel size in byte is different if an alpha byte is added too*/
-        uint8_t px_size_byte = alpha_byte ? LV_IMG_PX_SIZE_ALPHA_BYTE : sizeof(lv_color_t);
-
-        /*Go to the first displayed pixel of the map*/
-        int32_t map_w = lv_area_get_width(map_area);
-        const uint8_t * map_buf_tmp = map_p;
-        map_buf_tmp += map_w * (draw_area.y1 - (map_area->y1 - disp_area->y1)) * px_size_byte;
-        map_buf_tmp += (draw_area.x1 - (map_area->x1 - disp_area->x1)) * px_size_byte;
-
-        lv_color_t c;
-        lv_color_t chroma_keyed_color = LV_COLOR_CHROMA_KEY;
-        uint32_t px_i = 0;
-
-        const uint8_t * map_px;
-
-        lv_coord_t draw_area_h = lv_area_get_height(&draw_area);
-        lv_coord_t draw_area_w = lv_area_get_width(&draw_area);
-
-        lv_area_t blend_area;
-        blend_area.x1 = draw_area.x1 + disp_area->x1;
-        blend_area.x2 = blend_area.x1 + draw_area_w - 1;
-        blend_area.y1 = disp_area->y1 + draw_area.y1;
-        blend_area.y2 = blend_area.y1;
-
-        bool transform = draw_dsc->angle != 0 || draw_dsc->zoom != LV_IMG_ZOOM_NONE ? true : false;
-        /*Simple ARGB image. Handle it as special case because it's very common*/
-        if(!mask_any && !transform && !chroma_key && draw_dsc->recolor_opa == LV_OPA_TRANSP && alpha_byte) {
-#if LV_USE_GPU_STM32_DMA2D && LV_COLOR_DEPTH == 32
-            /*Blend ARGB images directly*/
-            if(lv_area_get_size(&draw_area) > 240) {
-                int32_t disp_w = lv_area_get_width(disp_area);
-                lv_color_t * disp_buf = draw_buf->buf_act;
-                lv_color_t * disp_buf_first = disp_buf + disp_w * draw_area.y1 + draw_area.x1;
-                lv_gpu_stm32_dma2d_blend(disp_buf_first, disp_w, (const lv_color_t *)map_buf_tmp, draw_dsc->opa, map_w, draw_area_w,
-                                         draw_area_h);
-                return;
-            }
-#endif
-            uint32_t hor_res = (uint32_t) lv_disp_get_hor_res(disp);
-            uint32_t mask_buf_size = lv_area_get_size(&draw_area) > (uint32_t) hor_res ? hor_res : lv_area_get_size(&draw_area);
-            lv_color_t * map2 = lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t));
-            lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
-
-            int32_t x;
-            int32_t y;
-            for(y = 0; y < draw_area_h; y++) {
-                map_px = map_buf_tmp;
-                for(x = 0; x < draw_area_w; x++, map_px += px_size_byte, px_i++) {
-                    lv_opa_t px_opa = map_px[LV_IMG_PX_SIZE_ALPHA_BYTE - 1];
-                    mask_buf[px_i] = px_opa;
-                    if(px_opa) {
-#if LV_COLOR_DEPTH == 8 || LV_COLOR_DEPTH == 1
-                        map2[px_i].full =  map_px[0];
-#elif LV_COLOR_DEPTH == 16
-                        map2[px_i].full =  map_px[0] + (map_px[1] << 8);
-#elif LV_COLOR_DEPTH == 32
-                        map2[px_i].full =  *((uint32_t *)map_px);
-#endif
-                    }
-#if LV_COLOR_DEPTH == 32
-                    map2[px_i].ch.alpha = 0xFF;
-#endif
-                }
-
-                map_buf_tmp += map_w * px_size_byte;
-                if(px_i + draw_area_w < mask_buf_size) {
-                    blend_area.y2 ++;
-                }
-                else {
-                    _lv_blend_map(clip_area, &blend_area, map2, mask_buf, LV_DRAW_MASK_RES_CHANGED, draw_dsc->opa, draw_dsc->blend_mode);
-
-                    blend_area.y1 = blend_area.y2 + 1;
-                    blend_area.y2 = blend_area.y1;
-
-                    px_i = 0;
-                }
-            }
-            /*Flush the last part*/
-            if(blend_area.y1 != blend_area.y2) {
-                blend_area.y2--;
-                _lv_blend_map(clip_area, &blend_area, map2, mask_buf, LV_DRAW_MASK_RES_CHANGED, draw_dsc->opa, draw_dsc->blend_mode);
-            }
-
-            lv_mem_buf_release(mask_buf);
-            lv_mem_buf_release(map2);
-        }
-        /*Most complicated case: transform or other mask or chroma keyed*/
-        else {
-            /*Build the image and a mask line-by-line*/
-            uint32_t hor_res = (uint32_t) lv_disp_get_hor_res(disp);
-            uint32_t mask_buf_size = lv_area_get_size(&draw_area) > hor_res ? hor_res : lv_area_get_size(&draw_area);
-            lv_color_t * map2 = lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t));
-            lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
-
-#if LV_DRAW_COMPLEX
-            lv_img_transform_dsc_t trans_dsc;
-            lv_memset_00(&trans_dsc, sizeof(lv_img_transform_dsc_t));
-            if(transform) {
-                lv_img_cf_t cf = LV_IMG_CF_TRUE_COLOR;
-                if(alpha_byte) cf = LV_IMG_CF_TRUE_COLOR_ALPHA;
-                else if(chroma_key) cf = LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED;
-
-                trans_dsc.cfg.angle = draw_dsc->angle;
-                trans_dsc.cfg.zoom = draw_dsc->zoom;
-                trans_dsc.cfg.src = map_p;
-                trans_dsc.cfg.src_w = map_w;
-                trans_dsc.cfg.src_h = lv_area_get_height(map_area);;
-                trans_dsc.cfg.cf = cf;
-                trans_dsc.cfg.pivot_x = draw_dsc->pivot.x;
-                trans_dsc.cfg.pivot_y = draw_dsc->pivot.y;
-                trans_dsc.cfg.color = draw_dsc->recolor;
-                trans_dsc.cfg.antialias = draw_dsc->antialias;
-
-                _lv_img_buf_transform_init(&trans_dsc);
-            }
-#endif
-            uint16_t recolor_premult[3] = {0};
-            lv_opa_t recolor_opa_inv = 255 - draw_dsc->recolor_opa;
-            if(draw_dsc->recolor_opa != 0) {
-                lv_color_premult(draw_dsc->recolor, draw_dsc->recolor_opa, recolor_premult);
-            }
-
-            lv_draw_mask_res_t mask_res;
-            mask_res = (alpha_byte || chroma_key || draw_dsc->angle ||
-                        draw_dsc->zoom != LV_IMG_ZOOM_NONE) ? LV_DRAW_MASK_RES_CHANGED : LV_DRAW_MASK_RES_FULL_COVER;
-
-            /*Prepare the `mask_buf`if there are other masks*/
-            if(mask_any) {
-                lv_memset_ff(mask_buf, mask_buf_size);
-            }
-
-            int32_t x;
-            int32_t y;
-#if LV_DRAW_COMPLEX
-            int32_t rot_y = disp_area->y1 + draw_area.y1 - map_area->y1;
-#endif
-            for(y = 0; y < draw_area_h; y++) {
-                map_px = map_buf_tmp;
-#if LV_DRAW_COMPLEX
-                uint32_t px_i_start = px_i;
-                int32_t rot_x = disp_area->x1 + draw_area.x1 - map_area->x1;
-#endif
-
-                for(x = 0; x < draw_area_w; x++, map_px += px_size_byte, px_i++) {
-
-#if LV_DRAW_COMPLEX
-                    if(transform) {
-
-                        /*Transform*/
-                        bool ret;
-                        ret = _lv_img_buf_transform(&trans_dsc, rot_x + x, rot_y + y);
-                        if(ret == false) {
-                            mask_buf[px_i] = LV_OPA_TRANSP;
-                            continue;
-                        }
-                        else {
-                            mask_buf[px_i] = trans_dsc.res.opa;
-                            c.full = trans_dsc.res.color.full;
-                        }
-                    }
-                    /*No transform*/
-                    else
-#endif
-                    {
-                        if(alpha_byte) {
-                            lv_opa_t px_opa = map_px[LV_IMG_PX_SIZE_ALPHA_BYTE - 1];
-                            mask_buf[px_i] = px_opa;
-                            if(px_opa == 0) {
-#if  LV_COLOR_DEPTH == 32
-                                map2[px_i].full = 0;
-#endif
-                                continue;
-                            }
-                        }
-                        else {
-                            mask_buf[px_i] = 0xFF;
-                        }
-
-#if LV_COLOR_DEPTH == 1
-                        c.full = map_px[0];
-#elif LV_COLOR_DEPTH == 8
-                        c.full =  map_px[0];
-#elif LV_COLOR_DEPTH == 16
-                        c.full =  map_px[0] + (map_px[1] << 8);
-#elif LV_COLOR_DEPTH == 32
-                        c.full =  *((uint32_t *)map_px);
-                        c.ch.alpha = 0xFF;
-#endif
-                        if(chroma_key) {
-                            if(c.full == chroma_keyed_color.full) {
-                                mask_buf[px_i] = LV_OPA_TRANSP;
-#if  LV_COLOR_DEPTH == 32
-                                map2[px_i].full = 0;
-#endif
-                                continue;
-                            }
-                        }
-
-                    }
-                    if(draw_dsc->recolor_opa != 0) {
-                        c = lv_color_mix_premult(recolor_premult, c, recolor_opa_inv);
-                    }
-
-                    map2[px_i].full = c.full;
-                }
-#if LV_DRAW_COMPLEX
-                /*Apply the masks if any*/
-                if(mask_any) {
-                    lv_draw_mask_res_t mask_res_sub;
-                    mask_res_sub = lv_draw_mask_apply(mask_buf + px_i_start, draw_area.x1 + draw_buf->area.x1,
-                                                      y + draw_area.y1 + draw_buf->area.y1,
-                                                      draw_area_w);
-                    if(mask_res_sub == LV_DRAW_MASK_RES_TRANSP) {
-                        lv_memset_00(mask_buf + px_i_start, draw_area_w);
-                        mask_res = LV_DRAW_MASK_RES_CHANGED;
-                    }
-                    else if(mask_res_sub == LV_DRAW_MASK_RES_CHANGED) {
-                        mask_res = LV_DRAW_MASK_RES_CHANGED;
-                    }
-                }
-#endif
-
-                map_buf_tmp += map_w * px_size_byte;
-                if(px_i + draw_area_w < mask_buf_size) {
-                    blend_area.y2 ++;
-                }
-                else {
-
-                    _lv_blend_map(clip_area, &blend_area, map2, mask_buf, mask_res, draw_dsc->opa, draw_dsc->blend_mode);
-
-                    blend_area.y1 = blend_area.y2 + 1;
-                    blend_area.y2 = blend_area.y1;
-
-                    px_i = 0;
-                    mask_res = (alpha_byte || chroma_key || draw_dsc->angle ||
-                                draw_dsc->zoom != LV_IMG_ZOOM_NONE) ? LV_DRAW_MASK_RES_CHANGED : LV_DRAW_MASK_RES_FULL_COVER;
-
-                    /*Prepare the `mask_buf`if there are other masks*/
-                    if(mask_any) {
-                        lv_memset_ff(mask_buf, mask_buf_size);
-                    }
-                }
-            }
-
-            /*Flush the last part*/
-            if(blend_area.y1 != blend_area.y2) {
-                blend_area.y2--;
-                _lv_blend_map(clip_area, &blend_area, map2, mask_buf, mask_res, draw_dsc->opa, draw_dsc->blend_mode);
-            }
-
-            lv_mem_buf_release(mask_buf);
-            lv_mem_buf_release(map2);
-        }
-    }
-}
-
-static void show_error(const lv_area_t * coords, const lv_area_t * clip_area, const char * msg)
+static void show_error(lv_draw_ctx_t * draw_ctx, const lv_area_t * coords, const char * msg)
 {
     lv_draw_rect_dsc_t rect_dsc;
     lv_draw_rect_dsc_init(&rect_dsc);
     rect_dsc.bg_color = lv_color_white();
-    lv_draw_rect(coords, clip_area, &rect_dsc);
+    lv_draw_rect(draw_ctx, &rect_dsc, coords);
 
     lv_draw_label_dsc_t label_dsc;
     lv_draw_label_dsc_init(&label_dsc);
-    lv_draw_label(coords, clip_area, &label_dsc, msg, NULL);
+    lv_draw_label(draw_ctx, &label_dsc, coords, msg, NULL);
 }
 
 static void draw_cleanup(_lv_img_cache_entry_t * cache)
@@ -664,5 +353,3 @@ static void draw_cleanup(_lv_img_cache_entry_t * cache)
     LV_UNUSED(cache);
 #endif
 }
-
-#endif //LV_USE_GPU_SDL_RENDER
\ No newline at end of file
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.h
index 3608bc00e..504bedae4 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.h
@@ -15,7 +15,7 @@ extern "C" {
  *********************/
 #include "lv_img_decoder.h"
 #include "lv_img_buf.h"
-#include "lv_draw_blend.h"
+#include "../misc/lv_style.h"
 
 /*********************
  *      DEFINES
@@ -45,6 +45,8 @@ typedef struct {
     uint8_t antialias       : 1;
 } lv_draw_img_dsc_t;
 
+struct _lv_draw_ctx_t;
+
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
@@ -57,7 +59,12 @@ void lv_draw_img_dsc_init(lv_draw_img_dsc_t * dsc);
  * @param src pointer to a lv_color_t array which contains the pixels of the image
  * @param dsc pointer to an initialized `lv_draw_img_dsc_t` variable
  */
-void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void * src, const lv_draw_img_dsc_t * dsc);
+void lv_draw_img(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc, const lv_area_t * coords,
+                 const void * src);
+
+
+void lv_draw_img_decoded(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc,
+                         const lv_area_t * coords, const uint8_t * map_p, lv_img_cf_t color_format);
 
 /**
  * Get the type of an image source
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.c
index 3ae4f0e5b..8569c7dd0 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.c
@@ -6,6 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw.h"
 #include "lv_draw_label.h"
 #include "../misc/lv_math.h"
 #include "../hal/lv_hal_disp.h"
@@ -13,9 +14,6 @@
 #include "../misc/lv_bidi.h"
 #include "../misc/lv_assert.h"
 
-#if LV_USE_GPU_SDL
-    #include "../gpu/lv_gpu_sdl.h"
-#endif
 /*********************
  *      DEFINES
  *********************/
@@ -36,17 +34,6 @@ typedef uint8_t cmd_state_t;
  *  STATIC PROTOTYPES
  **********************/
 
-#if LV_USE_EXTERNAL_RENDERER == 0
-LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g,
-                                                     const lv_area_t * clip_area,
-                                                     const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
-
-#if LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX
-static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g, const lv_area_t * clip_area,
-                              const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
-#endif /*LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX*/
-#endif /*LV_USE_EXTERNAL_RENDERER*/
-
 static uint8_t hex_char_to_num(char hex);
 
 /**********************
@@ -57,37 +44,6 @@ static uint8_t hex_char_to_num(char hex);
  *  GLOBAL VARIABLES
  **********************/
 
-const uint8_t _lv_bpp1_opa_table[2]  = {0, 255};          /*Opacity mapping with bpp = 1 (Just for compatibility)*/
-const uint8_t _lv_bpp2_opa_table[4]  = {0, 85, 170, 255}; /*Opacity mapping with bpp = 2*/
-
-const uint8_t _lv_bpp3_opa_table[8]  = {0, 36,  73, 109,   /*Opacity mapping with bpp = 3*/
-                                        146, 182,  219, 255
-                                       };
-
-const uint8_t _lv_bpp4_opa_table[16] = {0,  17, 34,  51,  /*Opacity mapping with bpp = 4*/
-                                        68, 85, 102, 119,
-                                        136, 153, 170, 187,
-                                        204, 221, 238, 255
-                                       };
-
-const uint8_t _lv_bpp8_opa_table[256] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-                                         32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-                                         48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-                                         64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-                                         80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
-                                         96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
-                                         112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-                                         128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-                                         144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
-                                         160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
-                                         176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-                                         192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
-                                         208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-                                         224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-                                         240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-                                        };
-
 /**********************
  *      MACROS
  **********************/
@@ -96,7 +52,7 @@ const uint8_t _lv_bpp8_opa_table[256] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 1
  *   GLOBAL FUNCTIONS
  **********************/
 
-LV_ATTRIBUTE_FAST_MEM void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc)
+void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc)
 {
     lv_memset_00(dsc, sizeof(lv_draw_label_dsc_t));
     dsc->opa = LV_OPA_COVER;
@@ -118,13 +74,22 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc)
  * @param hint pointer to a `lv_draw_label_hint_t` variable.
  * It is managed by the draw to speed up the drawing of very long texts (thousands of lines).
  */
-LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask,
-                                         const lv_draw_label_dsc_t * dsc,
-                                         const char * txt,
-                                         lv_draw_label_hint_t * hint)
+LV_ATTRIBUTE_FAST_MEM void lv_draw_label(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,
+                                         const lv_area_t * coords, const char * txt, lv_draw_label_hint_t * hint)
 {
-
     if(dsc->opa <= LV_OPA_MIN) return;
+    if(dsc->font == NULL) {
+        LV_LOG_WARN("dsc->font == NULL");
+        return;
+    }
+
+    if(draw_ctx->draw_letter == NULL) {
+        LV_LOG_WARN("draw->draw_letter == NULL (there is no function to draw letters)");
+        return;
+    }
+
+    lv_draw_label_dsc_t dsc_mod = *dsc;
+
     const lv_font_t * font = dsc->font;
     int32_t w;
 
@@ -133,7 +98,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
         return;
 
     lv_area_t clipped_area;
-    bool clip_ok = _lv_area_intersect(&clipped_area, coords, mask);
+    bool clip_ok = _lv_area_intersect(&clipped_area, coords, draw_ctx->clip_area);
     if(!clip_ok) return;
 
     lv_text_align_t align = dsc->align;
@@ -146,7 +111,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
         w = lv_area_get_width(coords);
     }
     else {
-        /*If EXAPND is enabled then not limit the text's width to the object's width*/
+        /*If EXPAND is enabled then not limit the text's width to the object's width*/
         lv_point_t p;
         lv_txt_get_size(&p, txt, dsc->font, dsc->letter_space, dsc->line_space, LV_COORD_MAX,
                         dsc->flag);
@@ -186,13 +151,13 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
         pos.y += hint->y;
     }
 
-    uint32_t line_end = line_start + _lv_txt_get_next_line(&txt[line_start], font, dsc->letter_space, w, dsc->flag);
+    uint32_t line_end = line_start + _lv_txt_get_next_line(&txt[line_start], font, dsc->letter_space, w, NULL, dsc->flag);
 
     /*Go the first visible line*/
-    while(pos.y + line_height_font < mask->y1) {
+    while(pos.y + line_height_font < draw_ctx->clip_area->y1) {
         /*Go to next line*/
         line_start = line_end;
-        line_end += _lv_txt_get_next_line(&txt[line_start], font, dsc->letter_space, w, dsc->flag);
+        line_end += _lv_txt_get_next_line(&txt[line_start], font, dsc->letter_space, w, NULL, dsc->flag);
         pos.y += line_height;
 
         /*Save at the threshold coordinate*/
@@ -217,9 +182,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
         line_width = lv_txt_get_width(&txt[line_start], line_end - line_start, font, dsc->letter_space, dsc->flag);
         pos.x += lv_area_get_width(coords) - line_width;
     }
-
-    lv_opa_t opa = dsc->opa;
-
     uint32_t sel_start = dsc->sel_start;
     uint32_t sel_end = dsc->sel_end;
     if(sel_start > sel_end) {
@@ -241,6 +203,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
     uint32_t i;
     uint32_t par_start = 0;
     lv_color_t recolor;
+    lv_color_t color = lv_color_black();
     int32_t letter_w;
 
     lv_draw_rect_dsc_t draw_dsc_sel;
@@ -317,7 +280,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
                 }
             }
 
-            lv_color_t color = dsc->color;
+            color = dsc->color;
 
             if(cmd_state == CMD_STATE_IN) color = recolor;
 
@@ -330,12 +293,13 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
                     sel_coords.y1 = pos.y;
                     sel_coords.x2 = pos.x + letter_w + dsc->letter_space - 1;
                     sel_coords.y2 = pos.y + line_height - 1;
-                    lv_draw_rect(&sel_coords, mask, &draw_dsc_sel);
+                    lv_draw_rect(draw_ctx, &draw_dsc_sel, &sel_coords);
                     color = dsc->sel_color;
                 }
             }
 
-            lv_draw_letter(&pos, mask, font, letter, color, opa, dsc->blend_mode);
+            dsc_mod.color = color;
+            lv_draw_letter(draw_ctx, &dsc_mod, &pos, letter);
 
             if(letter_w > 0) {
                 pos.x += letter_w + dsc->letter_space;
@@ -349,7 +313,8 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
             p1.y = pos.y + (dsc->font->line_height / 2)  + line_dsc.width / 2;
             p2.x = pos.x;
             p2.y = p1.y;
-            lv_draw_line(&p1, &p2, mask, &line_dsc);
+            line_dsc.color = color;
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
         }
 
         if(dsc->decor  & LV_TEXT_DECOR_UNDERLINE) {
@@ -359,7 +324,8 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
             p1.y = pos.y + dsc->font->line_height - dsc->font->base_line - font->underline_position;
             p2.x = pos.x;
             p2.y = p1.y;
-            lv_draw_line(&p1, &p2, mask, &line_dsc);
+            line_dsc.color = color;
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
         }
 
 #if LV_USE_BIDI
@@ -368,7 +334,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
 #endif
         /*Go to next line*/
         line_start = line_end;
-        line_end += _lv_txt_get_next_line(&txt[line_start], font, dsc->letter_space, w, dsc->flag);
+        line_end += _lv_txt_get_next_line(&txt[line_start], font, dsc->letter_space, w, NULL, dsc->flag);
 
         pos.x = coords->x1;
         /*Align to middle*/
@@ -389,450 +355,23 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
         /*Go the next line position*/
         pos.y += line_height;
 
-        if(pos.y > mask->y2) return;
+        if(pos.y > draw_ctx->clip_area->y2) return;
     }
 
     LV_ASSERT_MEM_INTEGRITY();
 }
 
-#if LV_USE_EXTERNAL_RENDERER == 0
+void lv_draw_letter(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,  const lv_point_t * pos_p,
+                    uint32_t letter)
+{
+    draw_ctx->draw_letter(draw_ctx, dsc, pos_p, letter);
+}
+
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
 
-/**
- * Draw a letter in the Virtual Display Buffer
- * @param pos_p left-top coordinate of the latter
- * @param mask_p the letter will be drawn only on this area  (truncated to draw_buf area)
- * @param font_p pointer to font
- * @param letter a letter to draw
- * @param color color of letter
- * @param opa opacity of letter (0..255)
- */
-LV_ATTRIBUTE_FAST_MEM void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * clip_area,
-                                          const lv_font_t * font_p,
-                                          uint32_t letter,
-                                          lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
-{
-    if(opa < LV_OPA_MIN) return;
-    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
-
-    if(font_p == NULL) {
-        LV_LOG_WARN("lv_draw_letter: font is NULL");
-        return;
-    }
-
-    lv_font_glyph_dsc_t g;
-    bool g_ret = lv_font_get_glyph_dsc(font_p, &g, letter, '\0');
-    if(g_ret == false)  {
-        /*Add warning if the dsc is not found
-         *but do not print warning for non printable ASCII chars (e.g. '\n')*/
-        if(letter >= 0x20 &&
-           letter != 0xf8ff && /*LV_SYMBOL_DUMMY*/
-           letter != 0x200c) { /*ZERO WIDTH NON-JOINER*/
-            LV_LOG_WARN("lv_draw_letter: glyph dsc. not found for U+%X", (unsigned int)letter);
-        }
-        return;
-    }
-
-    /*Don't draw anything if the character is empty. E.g. space*/
-    if((g.box_h == 0) || (g.box_w == 0)) return;
-
-    int32_t pos_x = pos_p->x + g.ofs_x;
-    int32_t pos_y = pos_p->y + (font_p->line_height - font_p->base_line) - g.box_h - g.ofs_y;
-
-    /*If the letter is completely out of mask don't draw it*/
-    if(pos_x + g.box_w < clip_area->x1 ||
-       pos_x > clip_area->x2 ||
-       pos_y + g.box_h < clip_area->y1 ||
-       pos_y > clip_area->y2)  {
-        return;
-    }
-
-    const uint8_t * map_p = lv_font_get_glyph_bitmap(font_p, letter);
-    if(map_p == NULL) {
-        LV_LOG_WARN("lv_draw_letter: character's bitmap not found");
-        return;
-    }
-
-    if(font_p->subpx) {
-#if LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX
-        draw_letter_subpx(pos_x, pos_y, &g, clip_area, map_p, color, opa, blend_mode);
-#else
-        LV_LOG_WARN("Can't draw sub-pixel rendered letter because LV_USE_FONT_SUBPX == 0 in lv_conf.h");
-#endif
-    }
-    else {
-        draw_letter_normal(pos_x, pos_y, &g, clip_area, map_p, color, opa, blend_mode);
-    }
-}
-
-LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g,
-                                                     const lv_area_t * clip_area,
-                                                     const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
-{
-    const uint8_t * bpp_opa_table_p;
-    uint32_t bitmask_init;
-    uint32_t bitmask;
-    uint32_t bpp = g->bpp;
-    uint32_t shades;
-    if(bpp == 3) bpp = 4;
-
-    switch(bpp) {
-        case 1:
-            bpp_opa_table_p = _lv_bpp1_opa_table;
-            bitmask_init  = 0x80;
-            shades = 2;
-            break;
-        case 2:
-            bpp_opa_table_p = _lv_bpp2_opa_table;
-            bitmask_init  = 0xC0;
-            shades = 4;
-            break;
-        case 4:
-            bpp_opa_table_p = _lv_bpp4_opa_table;
-            bitmask_init  = 0xF0;
-            shades = 16;
-            break;
-        case 8:
-            bpp_opa_table_p = _lv_bpp8_opa_table;
-            bitmask_init  = 0xFF;
-            shades = 256;
-            break;       /*No opa table, pixel value will be used directly*/
-        default:
-            LV_LOG_WARN("lv_draw_letter: invalid bpp");
-            return; /*Invalid bpp. Can't render the letter*/
-    }
-
-    static lv_opa_t opa_table[256];
-    static lv_opa_t prev_opa = LV_OPA_TRANSP;
-    static uint32_t prev_bpp = 0;
-    if(opa < LV_OPA_MAX) {
-        if(prev_opa != opa || prev_bpp != bpp) {
-            uint32_t i;
-            for(i = 0; i < shades; i++) {
-                opa_table[i] = bpp_opa_table_p[i] == LV_OPA_COVER ? opa : ((bpp_opa_table_p[i] * opa) >> 8);
-            }
-        }
-        bpp_opa_table_p = opa_table;
-        prev_opa = opa;
-        prev_bpp = bpp;
-    }
-
-    int32_t col, row;
-    int32_t box_w = g->box_w;
-    int32_t box_h = g->box_h;
-    int32_t width_bit = box_w * bpp; /*Letter width in bits*/
-
-    /*Calculate the col/row start/end on the map*/
-    int32_t col_start = pos_x >= clip_area->x1 ? 0 : clip_area->x1 - pos_x;
-    int32_t col_end   = pos_x + box_w <= clip_area->x2 ? box_w : clip_area->x2 - pos_x + 1;
-    int32_t row_start = pos_y >= clip_area->y1 ? 0 : clip_area->y1 - pos_y;
-    int32_t row_end   = pos_y + box_h <= clip_area->y2 ? box_h : clip_area->y2 - pos_y + 1;
-
-    /*Move on the map too*/
-    uint32_t bit_ofs = (row_start * width_bit) + (col_start * bpp);
-    map_p += bit_ofs >> 3;
-
-    uint8_t letter_px;
-    uint32_t col_bit;
-    col_bit = bit_ofs & 0x7; /*"& 0x7" equals to "% 8" just faster*/
-
-    lv_coord_t hor_res = lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
-    uint32_t mask_buf_size = box_w * box_h > hor_res ? hor_res : box_w * box_h;
-    lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
-    int32_t mask_p = 0;
-
-    lv_area_t fill_area;
-    fill_area.x1 = col_start + pos_x;
-    fill_area.x2 = col_end  + pos_x - 1;
-    fill_area.y1 = row_start + pos_y;
-    fill_area.y2 = fill_area.y1;
-#if LV_DRAW_COMPLEX
-    bool mask_any = lv_draw_mask_is_any(&fill_area);
-#endif
-
-    uint32_t col_bit_max = 8 - bpp;
-    uint32_t col_bit_row_ofs = (box_w + col_start - col_end) * bpp;
-
-    for(row = row_start ; row < row_end; row++) {
-#if LV_DRAW_COMPLEX
-        int32_t mask_p_start = mask_p;
-#endif
-        bitmask = bitmask_init >> col_bit;
-        for(col = col_start; col < col_end; col++) {
-            /*Load the pixel's opacity into the mask*/
-            letter_px = (*map_p & bitmask) >> (col_bit_max - col_bit);
-            if(letter_px) {
-                mask_buf[mask_p] = bpp_opa_table_p[letter_px];
-            }
-            else {
-                mask_buf[mask_p] = 0;
-            }
-
-            /*Go to the next column*/
-            if(col_bit < col_bit_max) {
-                col_bit += bpp;
-                bitmask = bitmask >> bpp;
-            }
-            else {
-                col_bit = 0;
-                bitmask = bitmask_init;
-                map_p++;
-            }
-
-            /*Next mask byte*/
-            mask_p++;
-        }
-
-#if LV_DRAW_COMPLEX
-        /*Apply masks if any*/
-        if(mask_any) {
-            lv_draw_mask_res_t mask_res = lv_draw_mask_apply(mask_buf + mask_p_start, fill_area.x1, fill_area.y2,
-                                                             lv_area_get_width(&fill_area));
-            if(mask_res == LV_DRAW_MASK_RES_TRANSP) {
-                lv_memset_00(mask_buf + mask_p_start, lv_area_get_width(&fill_area));
-            }
-        }
-#endif
-
-        if((uint32_t) mask_p + (col_end - col_start) < mask_buf_size) {
-            fill_area.y2 ++;
-        }
-        else {
-            _lv_blend_fill(clip_area, &fill_area,
-                           color, mask_buf, LV_DRAW_MASK_RES_CHANGED, LV_OPA_COVER,
-                           blend_mode);
-
-            fill_area.y1 = fill_area.y2 + 1;
-            fill_area.y2 = fill_area.y1;
-            mask_p = 0;
-        }
-
-        col_bit += col_bit_row_ofs;
-        map_p += (col_bit >> 3);
-        col_bit = col_bit & 0x7;
-    }
-
-    /*Flush the last part*/
-    if(fill_area.y1 != fill_area.y2) {
-        fill_area.y2--;
-        _lv_blend_fill(clip_area, &fill_area,
-                       color, mask_buf, LV_DRAW_MASK_RES_CHANGED, LV_OPA_COVER,
-                       blend_mode);
-        mask_p = 0;
-    }
-
-    lv_mem_buf_release(mask_buf);
-}
-
-#if LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX
-static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g, const lv_area_t * clip_area,
-                              const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
-{
-    const uint8_t * bpp_opa_table;
-    uint32_t bitmask_init;
-    uint32_t bitmask;
-    uint32_t bpp = g->bpp;
-    if(bpp == 3) bpp = 4;
-
-    switch(bpp) {
-        case 1:
-            bpp_opa_table = _lv_bpp1_opa_table;
-            bitmask_init  = 0x80;
-            break;
-        case 2:
-            bpp_opa_table = _lv_bpp2_opa_table;
-            bitmask_init  = 0xC0;
-            break;
-        case 4:
-            bpp_opa_table = _lv_bpp4_opa_table;
-            bitmask_init  = 0xF0;
-            break;
-        case 8:
-            bpp_opa_table = _lv_bpp8_opa_table;
-            bitmask_init  = 0xFF;
-            break;       /*No opa table, pixel value will be used directly*/
-        default:
-            LV_LOG_WARN("lv_draw_letter: invalid bpp not found");
-            return; /*Invalid bpp. Can't render the letter*/
-    }
-
-    int32_t col, row;
-
-    int32_t box_w = g->box_w;
-    int32_t box_h = g->box_h;
-    int32_t width_bit = box_w * bpp; /*Letter width in bits*/
-
-    /*Calculate the col/row start/end on the map*/
-    int32_t col_start = pos_x >= clip_area->x1 ? 0 : (clip_area->x1 - pos_x) * 3;
-    int32_t col_end   = pos_x + box_w / 3 <= clip_area->x2 ? box_w : (clip_area->x2 - pos_x + 1) * 3;
-    int32_t row_start = pos_y >= clip_area->y1 ? 0 : clip_area->y1 - pos_y;
-    int32_t row_end   = pos_y + box_h <= clip_area->y2 ? box_h : clip_area->y2 - pos_y + 1;
-
-    /*Move on the map too*/
-    int32_t bit_ofs = (row_start * width_bit) + (col_start * bpp);
-    map_p += bit_ofs >> 3;
-
-    uint8_t letter_px;
-    lv_opa_t px_opa;
-    int32_t col_bit;
-    col_bit = bit_ofs & 0x7; /*"& 0x7" equals to "% 8" just faster*/
-
-    lv_area_t map_area;
-    map_area.x1 = col_start / 3 + pos_x;
-    map_area.x2 = col_end / 3  + pos_x - 1;
-    map_area.y1 = row_start + pos_y;
-    map_area.y2 = map_area.y1;
-
-    if(map_area.x2 <= map_area.x1) return;
-
-    int32_t mask_buf_size = box_w * box_h > _LV_MASK_BUF_MAX_SIZE ? _LV_MASK_BUF_MAX_SIZE : g->box_w * g->box_h;
-    lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
-    int32_t mask_p = 0;
-
-    lv_color_t * color_buf = lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t));
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-
-    int32_t disp_buf_width = lv_area_get_width(&draw_buf->area);
-    lv_color_t * disp_buf_buf_tmp = draw_buf->buf_act;
-
-    /*Set a pointer on draw_buf to the first pixel of the letter*/
-    disp_buf_buf_tmp += ((pos_y - draw_buf->area.y1) * disp_buf_width) + pos_x - draw_buf->area.x1;
-
-    /*If the letter is partially out of mask the move there on draw_buf*/
-    disp_buf_buf_tmp += (row_start * disp_buf_width) + col_start / 3;
-
-    bool mask_any = lv_draw_mask_is_any(&map_area);
-    uint8_t font_rgb[3];
-
-#if LV_COLOR_16_SWAP == 0
-    uint8_t txt_rgb[3] = {color.ch.red, color.ch.green, color.ch.blue};
-#else
-    uint8_t txt_rgb[3] = {color.ch.red, (color.ch.green_h << 3) + color.ch.green_l, color.ch.blue};
-#endif
-
-    for(row = row_start ; row < row_end; row++) {
-        uint32_t subpx_cnt = 0;
-        bitmask = bitmask_init >> col_bit;
-        int32_t mask_p_start = mask_p;
-
-        for(col = col_start; col < col_end; col++) {
-            /*Load the pixel's opacity into the mask*/
-            letter_px = (*map_p & bitmask) >> (8 - col_bit - bpp);
-            if(letter_px != 0) {
-                if(opa == LV_OPA_COVER) {
-                    px_opa = bpp == 8 ? letter_px : bpp_opa_table[letter_px];
-                }
-                else {
-                    px_opa = bpp == 8 ? (uint32_t)((uint32_t)letter_px * opa) >> 8
-                             : (uint32_t)((uint32_t)bpp_opa_table[letter_px] * opa) >> 8;
-                }
-            }
-            else {
-                px_opa = 0;
-            }
-
-            font_rgb[subpx_cnt] = px_opa;
-
-            subpx_cnt ++;
-            if(subpx_cnt == 3) {
-                subpx_cnt = 0;
-
-                lv_color_t res_color;
-#if LV_COLOR_16_SWAP == 0
-                uint8_t bg_rgb[3] = {disp_buf_buf_tmp->ch.red, disp_buf_buf_tmp->ch.green, disp_buf_buf_tmp->ch.blue};
-#else
-                uint8_t bg_rgb[3] = {disp_buf_buf_tmp->ch.red,
-                                     (disp_buf_buf_tmp->ch.green_h << 3) + disp_buf_buf_tmp->ch.green_l,
-                                     disp_buf_buf_tmp->ch.blue
-                                    };
-#endif
-
-#if LV_FONT_SUBPX_BGR
-                res_color.ch.blue = (uint32_t)((uint32_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8;
-                res_color.ch.red = (uint32_t)((uint32_t)txt_rgb[2] * font_rgb[2] + (bg_rgb[2] * (255 - font_rgb[2]))) >> 8;
-#else
-                res_color.ch.red = (uint32_t)((uint16_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8;
-                res_color.ch.blue = (uint32_t)((uint16_t)txt_rgb[2] * font_rgb[2] + (bg_rgb[2] * (255 - font_rgb[2]))) >> 8;
-#endif
-
-#if LV_COLOR_16_SWAP == 0
-                res_color.ch.green = (uint32_t)((uint32_t)txt_rgb[1] * font_rgb[1] + (bg_rgb[1] * (255 - font_rgb[1]))) >> 8;
-#else
-                uint8_t green = (uint32_t)((uint32_t)txt_rgb[1] * font_rgb[1] + (bg_rgb[1] * (255 - font_rgb[1]))) >> 8;
-                res_color.ch.green_h = green >> 3;
-                res_color.ch.green_l = green & 0x7;
-#endif
-
-#if LV_COLOR_DEPTH == 32
-                res_color.ch.alpha =  0xff;
-#endif
-
-                if(font_rgb[0] == 0 && font_rgb[1] == 0 && font_rgb[2] == 0) mask_buf[mask_p] = LV_OPA_TRANSP;
-                else mask_buf[mask_p] = LV_OPA_COVER;
-                color_buf[mask_p] = res_color;
-
-                /*Next mask byte*/
-                mask_p++;
-                disp_buf_buf_tmp++;
-            }
-
-            /*Go to the next column*/
-            if(col_bit < (int32_t)(8 - bpp)) {
-                col_bit += bpp;
-                bitmask = bitmask >> bpp;
-            }
-            else {
-                col_bit = 0;
-                bitmask = bitmask_init;
-                map_p++;
-            }
-        }
-
-        /*Apply masks if any*/
-        if(mask_any) {
-            lv_draw_mask_res_t mask_res = lv_draw_mask_apply(mask_buf + mask_p_start, map_area.x1, map_area.y2,
-                                                             lv_area_get_width(&map_area));
-            if(mask_res == LV_DRAW_MASK_RES_TRANSP) {
-                lv_memset_00(mask_buf + mask_p_start, lv_area_get_width(&map_area));
-            }
-        }
-
-        if((int32_t) mask_p + (col_end - col_start) < mask_buf_size) {
-            map_area.y2 ++;
-        }
-        else {
-            _lv_blend_map(clip_area, &map_area, color_buf, mask_buf, LV_DRAW_MASK_RES_CHANGED, opa, blend_mode);
-
-            map_area.y1 = map_area.y2 + 1;
-            map_area.y2 = map_area.y1;
-            mask_p = 0;
-        }
-
-        col_bit += ((box_w - col_end) + col_start) * bpp;
-
-        map_p += (col_bit >> 3);
-        col_bit = col_bit & 0x7;
-
-        /*Next row in draw_buf*/
-        disp_buf_buf_tmp += disp_buf_width - (col_end - col_start) / 3;
-    }
-
-    /*Flush the last part*/
-    if(map_area.y1 != map_area.y2) {
-        map_area.y2--;
-        _lv_blend_map(clip_area, &map_area, color_buf, mask_buf, LV_DRAW_MASK_RES_CHANGED, opa, blend_mode);
-    }
-
-    lv_mem_buf_release(mask_buf);
-    lv_mem_buf_release(color_buf);
-}
-#endif /*LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX*/
-
-#endif /*LV_USE_EXTERNAL_RENDERER*/
 /**
  * Convert a hexadecimal characters to a number (0..15)
  * @param hex Pointer to a hexadecimal character (0..9, A..F)
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.h
index f4cc1fb88..de72eddf3 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.h
@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw_blend.h"
 #include "../misc/lv_bidi.h"
 #include "../misc/lv_txt.h"
 #include "../misc/lv_color.h"
+#include "../misc/lv_style.h"
 
 /*********************
  *      DEFINES
@@ -63,12 +63,11 @@ typedef struct _lv_draw_label_hint_t {
     int32_t coord_y;
 } lv_draw_label_hint_t;
 
+struct _lv_draw_ctx_t;
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
-//! @cond Doxygen_Suppress
-
 LV_ATTRIBUTE_FAST_MEM void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc);
 
 /**
@@ -80,22 +79,15 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc);
  * @param hint pointer to a `lv_draw_label_hint_t` variable.
  * It is managed by the draw to speed up the drawing of very long texts (thousands of lines).
  */
-LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask,
-                                         const lv_draw_label_dsc_t * dsc,
-                                         const char * txt, lv_draw_label_hint_t * hint);
+LV_ATTRIBUTE_FAST_MEM void lv_draw_label(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,
+                                         const lv_area_t * coords, const char * txt, lv_draw_label_hint_t * hint);
+
+void lv_draw_letter(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,  const lv_point_t * pos_p,
+                    uint32_t letter);
 
-LV_ATTRIBUTE_FAST_MEM void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * clip_area,
-                                          const lv_font_t * font_p,
-                                          uint32_t letter, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
-//! @endcond
 /***********************
  * GLOBAL VARIABLES
  ***********************/
-extern const uint8_t _lv_bpp2_opa_table[];
-extern const uint8_t _lv_bpp3_opa_table[];
-extern const uint8_t _lv_bpp1_opa_table[];
-extern const uint8_t _lv_bpp4_opa_table[];
-extern const uint8_t _lv_bpp8_opa_table[];
 
 /**********************
  *      MACROS
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.c
index 407a280a7..b4844dbd1 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.c
@@ -7,8 +7,6 @@
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "lv_draw_mask.h"
-#include "lv_draw_blend.h"
 #include "../core/lv_refr.h"
 #include "../misc/lv_math.h"
 
@@ -24,16 +22,6 @@
  *  STATIC PROTOTYPES
  **********************/
 
-LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(const lv_point_t * point1, const lv_point_t * point2,
-                                                 const lv_area_t * clip,
-                                                 const lv_draw_line_dsc_t * dsc);
-
-LV_ATTRIBUTE_FAST_MEM static void draw_line_hor(const lv_point_t * point1, const lv_point_t * point2,
-                                                const lv_area_t * clip,
-                                                const lv_draw_line_dsc_t * dsc);
-LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(const lv_point_t * point1, const lv_point_t * point2,
-                                                const lv_area_t * clip,
-                                                const lv_draw_line_dsc_t * dsc);
 /**********************
  *  STATIC VARIABLES
  **********************/
@@ -54,442 +42,15 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc)
     dsc->color = lv_color_black();
 }
 
-/**
- * Draw a line
- * @param point1 first point of the line
- * @param point2 second point of the line
- * @param clip the line will be drawn only in this area
- * @param dsc pointer to an initialized `lv_draw_line_dsc_t` variable
- */
-LV_ATTRIBUTE_FAST_MEM void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip,
-                                        const lv_draw_line_dsc_t * dsc)
+LV_ATTRIBUTE_FAST_MEM void lv_draw_line(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                        const lv_point_t * point1, const lv_point_t * point2)
 {
     if(dsc->width == 0) return;
     if(dsc->opa <= LV_OPA_MIN) return;
 
-    if(point1->x == point2->x && point1->y == point2->y) return;
-
-    lv_area_t clip_line;
-    clip_line.x1 = LV_MIN(point1->x, point2->x) - dsc->width / 2;
-    clip_line.x2 = LV_MAX(point1->x, point2->x) + dsc->width / 2;
-    clip_line.y1 = LV_MIN(point1->y, point2->y) - dsc->width / 2;
-    clip_line.y2 = LV_MAX(point1->y, point2->y) + dsc->width / 2;
-
-    bool is_common;
-    is_common = _lv_area_intersect(&clip_line, &clip_line, clip);
-    if(!is_common) return;
-
-    if(point1->y == point2->y) draw_line_hor(point1, point2, &clip_line, dsc);
-    else if(point1->x == point2->x) draw_line_ver(point1, point2, &clip_line, dsc);
-    else draw_line_skew(point1, point2, &clip_line, dsc);
-
-    if(dsc->round_end || dsc->round_start) {
-        lv_draw_rect_dsc_t cir_dsc;
-        lv_draw_rect_dsc_init(&cir_dsc);
-        cir_dsc.bg_color = dsc->color;
-        cir_dsc.radius = LV_RADIUS_CIRCLE;
-        cir_dsc.bg_opa = dsc->opa;
-
-        int32_t r = (dsc->width >> 1);
-        int32_t r_corr = (dsc->width & 1) ? 0 : 1;
-        lv_area_t cir_area;
-
-        if(dsc->round_start) {
-            cir_area.x1 = point1->x - r;
-            cir_area.y1 = point1->y - r;
-            cir_area.x2 = point1->x + r - r_corr;
-            cir_area.y2 = point1->y + r - r_corr ;
-            lv_draw_rect(&cir_area, clip, &cir_dsc);
-        }
-
-        if(dsc->round_end) {
-            cir_area.x1 = point2->x - r;
-            cir_area.y1 = point2->y - r;
-            cir_area.x2 = point2->x + r - r_corr;
-            cir_area.y2 = point2->y + r - r_corr ;
-            lv_draw_rect(&cir_area, clip, &cir_dsc);
-        }
-    }
+    draw_ctx->draw_line(draw_ctx, dsc, point1, point2);
 }
 
 /**********************
  *   STATIC FUNCTIONS
  **********************/
-
-
-LV_ATTRIBUTE_FAST_MEM static void draw_line_hor(const lv_point_t * point1, const lv_point_t * point2,
-                                                const lv_area_t * clip,
-                                                const lv_draw_line_dsc_t * dsc)
-{
-    lv_opa_t opa = dsc->opa;
-
-    int32_t w = dsc->width - 1;
-    int32_t w_half0 = w >> 1;
-    int32_t w_half1 = w_half0 + (w & 0x1); /*Compensate rounding error*/
-
-
-
-    lv_area_t draw_area;
-    draw_area.x1 = LV_MIN(point1->x, point2->x);
-    draw_area.x2 = LV_MAX(point1->x, point2->x)  - 1;
-    draw_area.y1 = point1->y - w_half1;
-    draw_area.y2 = point1->y + w_half0;
-
-    bool dashed = dsc->dash_gap && dsc->dash_width ? true : false;
-    bool simple_mode = true;
-    if(lv_draw_mask_is_any(&draw_area)) simple_mode = false;
-    else if(dashed) simple_mode = false;
-
-    /*If there is no mask then simply draw a rectangle*/
-    if(simple_mode) {
-        _lv_blend_fill(clip, &draw_area,
-                       dsc->color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa,
-                       dsc->blend_mode);
-    }
-#if LV_DRAW_COMPLEX
-    /*If there other mask apply it*/
-    else {
-        lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-        lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-        const lv_area_t * disp_area = &draw_buf->area;
-        /*Get clipped fill area which is the real draw area.
-         *It is always the same or inside `fill_area`*/
-        bool is_common;
-        is_common = _lv_area_intersect(&draw_area, clip, &draw_area);
-        if(!is_common) return;
-
-        /*Now `draw_area` has absolute coordinates.
-         *Make it relative to `disp_area` to simplify draw to `disp_buf`*/
-        draw_area.x1 -= disp_area->x1;
-        draw_area.y1 -= disp_area->y1;
-        draw_area.x2 -= disp_area->x1;
-        draw_area.y2 -= disp_area->y1;
-
-        int32_t draw_area_w = lv_area_get_width(&draw_area);
-
-        lv_area_t fill_area;
-        fill_area.x1 = draw_area.x1 + disp_area->x1;
-        fill_area.x2 = draw_area.x2 + disp_area->x1;
-        fill_area.y1 = draw_area.y1 + disp_area->y1;
-        fill_area.y2 = fill_area.y1;
-
-        lv_coord_t dash_start = 0;
-        if(dashed) {
-            dash_start = (draw_buf->area.x1 + draw_area.x1) % (dsc->dash_gap + dsc->dash_width);
-        }
-
-        lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
-        int32_t h;
-        for(h = draw_area.y1; h <= draw_area.y2; h++) {
-            lv_memset_ff(mask_buf, draw_area_w);
-            lv_draw_mask_res_t mask_res = lv_draw_mask_apply(mask_buf, draw_buf->area.x1 + draw_area.x1, draw_buf->area.y1 + h,
-                                                             draw_area_w);
-
-            if(dashed) {
-                if(mask_res != LV_DRAW_MASK_RES_TRANSP) {
-                    lv_coord_t dash_cnt = dash_start;
-                    lv_coord_t i;
-                    for(i = 0; i < draw_area_w; i++, dash_cnt++) {
-                        if(dash_cnt <= dsc->dash_width) {
-                            int16_t diff = dsc->dash_width - dash_cnt;
-                            i += diff;
-                            dash_cnt += diff;
-                        }
-                        else if(dash_cnt >= dsc->dash_gap + dsc->dash_width) {
-                            dash_cnt = 0;
-                        }
-                        else {
-                            mask_buf[i] = 0x00;
-                        }
-                    }
-
-                    mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-            }
-
-            _lv_blend_fill(clip, &fill_area,
-                           dsc->color, mask_buf, mask_res, dsc->opa,
-                           dsc->blend_mode);
-
-            fill_area.y1++;
-            fill_area.y2++;
-        }
-        lv_mem_buf_release(mask_buf);
-    }
-#endif /*LV_DRAW_COMPLEX*/
-}
-
-LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(const lv_point_t * point1, const lv_point_t * point2,
-                                                const lv_area_t * clip,
-                                                const lv_draw_line_dsc_t * dsc)
-{
-    lv_opa_t opa = dsc->opa;
-
-    int32_t w = dsc->width - 1;
-    int32_t w_half0 = w >> 1;
-    int32_t w_half1 = w_half0 + (w & 0x1); /*Compensate rounding error*/
-
-    lv_area_t draw_area;
-    draw_area.x1 = point1->x - w_half1;
-    draw_area.x2 = point1->x + w_half0;
-    draw_area.y1 = LV_MIN(point1->y, point2->y);
-    draw_area.y2 = LV_MAX(point1->y, point2->y) - 1;
-
-    bool dashed = dsc->dash_gap && dsc->dash_width ? true : false;
-    bool simple_mode = true;
-    if(lv_draw_mask_is_any(&draw_area)) simple_mode = false;
-    else if(dashed) simple_mode = false;
-
-    /*If there is no mask then simply draw a rectangle*/
-    if(simple_mode) {
-        _lv_blend_fill(clip, &draw_area,
-                       dsc->color,  NULL, LV_DRAW_MASK_RES_FULL_COVER, opa,
-                       dsc->blend_mode);
-    }
-
-#if LV_DRAW_COMPLEX
-    /*If there other mask apply it*/
-    else {
-        lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-        lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-        const lv_area_t * disp_area = &draw_buf->area;
-        /*Get clipped fill area which is the real draw area.
-         *It is always the same or inside `fill_area`*/
-        bool is_common;
-        is_common = _lv_area_intersect(&draw_area, clip, &draw_area);
-        if(!is_common) return;
-
-        /*Now `draw_area` has absolute coordinates.
-         *Make it relative to `disp_area` to simplify draw to `disp_buf`*/
-        draw_area.x1 -= draw_buf->area.x1;
-        draw_area.y1 -= draw_buf->area.y1;
-        draw_area.x2 -= draw_buf->area.x1;
-        draw_area.y2 -= draw_buf->area.y1;
-
-        int32_t draw_area_w = lv_area_get_width(&draw_area);
-
-        lv_area_t fill_area;
-        fill_area.x1 = draw_area.x1 + disp_area->x1;
-        fill_area.x2 = draw_area.x2 + disp_area->x1;
-        fill_area.y1 = draw_area.y1 + disp_area->y1;
-        fill_area.y2 = fill_area.y1;
-
-        lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
-
-        lv_coord_t dash_start = 0;
-        if(dashed) {
-            dash_start = (draw_buf->area.y1 + draw_area.y1) % (dsc->dash_gap + dsc->dash_width);
-        }
-
-        lv_coord_t dash_cnt = dash_start;
-
-        int32_t h;
-        for(h = draw_area.y1; h <= draw_area.y2; h++) {
-            lv_memset_ff(mask_buf, draw_area_w);
-            lv_draw_mask_res_t mask_res = lv_draw_mask_apply(mask_buf, draw_buf->area.x1 + draw_area.x1, draw_buf->area.y1 + h,
-                                                             draw_area_w);
-
-            if(dashed) {
-                if(mask_res != LV_DRAW_MASK_RES_TRANSP) {
-                    if(dash_cnt > dsc->dash_width) {
-                        mask_res = LV_DRAW_MASK_RES_TRANSP;
-                    }
-
-                    if(dash_cnt >= dsc->dash_gap + dsc->dash_width) {
-                        dash_cnt = 0;
-                    }
-                }
-                dash_cnt ++;
-            }
-
-            _lv_blend_fill(clip, &fill_area,
-                           dsc->color, mask_buf, mask_res, dsc->opa,
-                           LV_BLEND_MODE_NORMAL);
-
-            fill_area.y1++;
-            fill_area.y2++;
-        }
-        lv_mem_buf_release(mask_buf);
-    }
-#endif /*LV_DRAW_COMPLEX*/
-}
-
-LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(const lv_point_t * point1, const lv_point_t * point2,
-                                                 const lv_area_t * clip,
-                                                 const lv_draw_line_dsc_t * dsc)
-{
-#if LV_DRAW_COMPLEX
-    /*Keep the great y in p1*/
-    lv_point_t p1;
-    lv_point_t p2;
-    if(point1->y < point2->y) {
-        p1.y = point1->y;
-        p2.y = point2->y;
-        p1.x = point1->x;
-        p2.x = point2->x;
-    }
-    else {
-        p1.y = point2->y;
-        p2.y = point1->y;
-        p1.x = point2->x;
-        p2.x = point1->x;
-    }
-
-    int32_t xdiff = p2.x - p1.x;
-    int32_t ydiff = p2.y - p1.y;
-    bool flat = LV_ABS(xdiff) > LV_ABS(ydiff) ? true : false;
-
-    static const uint8_t wcorr[] = {
-        128, 128, 128, 129, 129, 130, 130, 131,
-        132, 133, 134, 135, 137, 138, 140, 141,
-        143, 145, 147, 149, 151, 153, 155, 158,
-        160, 162, 165, 167, 170, 173, 175, 178,
-        181,
-    };
-
-    int32_t w = dsc->width;
-    int32_t wcorr_i = 0;
-    if(flat) wcorr_i = (LV_ABS(ydiff) << 5) / LV_ABS(xdiff);
-    else wcorr_i = (LV_ABS(xdiff) << 5) / LV_ABS(ydiff);
-
-    w = (w * wcorr[wcorr_i] + 63) >> 7;     /*+ 63 for rounding*/
-    int32_t w_half0 = w >> 1;
-    int32_t w_half1 = w_half0 + (w & 0x1); /*Compensate rounding error*/
-
-    lv_area_t draw_area;
-    draw_area.x1 = LV_MIN(p1.x, p2.x) - w;
-    draw_area.x2 = LV_MAX(p1.x, p2.x) + w;
-    draw_area.y1 = LV_MIN(p1.y, p2.y) - w;
-    draw_area.y2 = LV_MAX(p1.y, p2.y) + w;
-
-    /*Get the union of `coords` and `clip`*/
-    /*`clip` is already truncated to the `draw_buf` size
-     *in 'lv_refr_area' function*/
-    bool is_common = _lv_area_intersect(&draw_area, &draw_area, clip);
-    if(is_common == false) return;
-
-    lv_draw_mask_line_param_t mask_left_param;
-    lv_draw_mask_line_param_t mask_right_param;
-    lv_draw_mask_line_param_t mask_top_param;
-    lv_draw_mask_line_param_t mask_bottom_param;
-
-    if(flat) {
-        if(xdiff > 0) {
-            lv_draw_mask_line_points_init(&mask_left_param, p1.x, p1.y - w_half0, p2.x, p2.y - w_half0,
-                                          LV_DRAW_MASK_LINE_SIDE_LEFT);
-            lv_draw_mask_line_points_init(&mask_right_param, p1.x, p1.y + w_half1, p2.x, p2.y + w_half1,
-                                          LV_DRAW_MASK_LINE_SIDE_RIGHT);
-        }
-        else {
-            lv_draw_mask_line_points_init(&mask_left_param, p1.x, p1.y + w_half1, p2.x, p2.y + w_half1,
-                                          LV_DRAW_MASK_LINE_SIDE_LEFT);
-            lv_draw_mask_line_points_init(&mask_right_param, p1.x, p1.y - w_half0, p2.x, p2.y - w_half0,
-                                          LV_DRAW_MASK_LINE_SIDE_RIGHT);
-        }
-    }
-    else {
-        lv_draw_mask_line_points_init(&mask_left_param, p1.x + w_half1, p1.y, p2.x + w_half1, p2.y,
-                                      LV_DRAW_MASK_LINE_SIDE_LEFT);
-        lv_draw_mask_line_points_init(&mask_right_param, p1.x - w_half0, p1.y, p2.x - w_half0, p2.y,
-                                      LV_DRAW_MASK_LINE_SIDE_RIGHT);
-    }
-
-    /*Use the normal vector for the endings*/
-
-    int16_t mask_left_id = lv_draw_mask_add(&mask_left_param, NULL);
-    int16_t mask_right_id = lv_draw_mask_add(&mask_right_param, NULL);
-    int16_t mask_top_id = LV_MASK_ID_INV;
-    int16_t mask_bottom_id = LV_MASK_ID_INV;
-
-    if(!dsc->raw_end) {
-        lv_draw_mask_line_points_init(&mask_top_param, p1.x, p1.y, p1.x - ydiff, p1.y + xdiff, LV_DRAW_MASK_LINE_SIDE_BOTTOM);
-        lv_draw_mask_line_points_init(&mask_bottom_param, p2.x, p2.y, p2.x - ydiff, p2.y + xdiff,  LV_DRAW_MASK_LINE_SIDE_TOP);
-        mask_top_id = lv_draw_mask_add(&mask_top_param, NULL);
-        mask_bottom_id = lv_draw_mask_add(&mask_bottom_param, NULL);
-    }
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    lv_disp_draw_buf_t * draw_buf = lv_disp_get_draw_buf(disp);
-
-    const lv_area_t * disp_area = &draw_buf->area;
-
-    /*Store the coordinates of the `draw_a` relative to the draw_buf*/
-    draw_area.x1 -= disp_area->x1;
-    draw_area.y1 -= disp_area->y1;
-    draw_area.x2 -= disp_area->x1;
-    draw_area.y2 -= disp_area->y1;
-
-    /*The real draw area is around the line.
-     *It's easy to calculate with steep lines, but the area can be very wide with very flat lines.
-     *So deal with it only with steep lines.*/
-    int32_t draw_area_w = lv_area_get_width(&draw_area);
-
-    /*Draw the background line by line*/
-    int32_t h;
-    uint32_t hor_res = (uint32_t)lv_disp_get_hor_res(disp);
-    size_t mask_buf_size = LV_MIN(lv_area_get_size(&draw_area), hor_res);
-    lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
-
-    lv_area_t fill_area;
-    fill_area.x1 = draw_area.x1 + disp_area->x1;
-    fill_area.x2 = draw_area.x2 + disp_area->x1;
-    fill_area.y1 = draw_area.y1 + disp_area->y1;
-    fill_area.y2 = fill_area.y1;
-
-    int32_t x = draw_buf->area.x1 + draw_area.x1;
-
-    uint32_t mask_p = 0;
-
-    lv_memset_ff(mask_buf, mask_buf_size);
-    /*Fill the first row with 'color'*/
-    for(h = draw_area.y1 + disp_area->y1; h <= draw_area.y2 + disp_area->y1; h++) {
-
-        lv_draw_mask_res_t mask_res = lv_draw_mask_apply(&mask_buf[mask_p], x, h, draw_area_w);
-        if(mask_res == LV_DRAW_MASK_RES_TRANSP) {
-            lv_memset_00(&mask_buf[mask_p], draw_area_w);
-        }
-
-        mask_p += draw_area_w;
-        if((uint32_t) mask_p + draw_area_w < mask_buf_size) {
-            fill_area.y2 ++;
-        }
-        else {
-            _lv_blend_fill(&fill_area, clip,
-                           dsc->color, mask_buf, LV_DRAW_MASK_RES_CHANGED, dsc->opa,
-                           dsc->blend_mode);
-
-            fill_area.y1 = fill_area.y2 + 1;
-            fill_area.y2 = fill_area.y1;
-            mask_p = 0;
-            lv_memset_ff(mask_buf, mask_buf_size);
-        }
-    }
-
-    /*Flush the last part*/
-    if(fill_area.y1 != fill_area.y2) {
-        fill_area.y2--;
-        _lv_blend_fill(&fill_area, clip,
-                       dsc->color, mask_buf, LV_DRAW_MASK_RES_CHANGED, dsc->opa,
-                       dsc->blend_mode);
-
-    }
-
-    lv_mem_buf_release(mask_buf);
-
-    lv_draw_mask_free_param(&mask_left_param);
-    lv_draw_mask_free_param(&mask_right_param);
-    if(mask_top_id != LV_MASK_ID_INV) lv_draw_mask_free_param(&mask_top_param);
-    if(mask_bottom_id != LV_MASK_ID_INV) lv_draw_mask_free_param(&mask_bottom_param);
-    lv_draw_mask_remove_id(mask_left_id);
-    lv_draw_mask_remove_id(mask_right_id);
-    lv_draw_mask_remove_id(mask_top_id);
-    lv_draw_mask_remove_id(mask_bottom_id);
-#else
-    LV_UNUSED(point1);
-    LV_UNUSED(point2);
-    LV_UNUSED(clip);
-    LV_UNUSED(dsc);
-    LV_LOG_WARN("Can't draw skewed line with LV_DRAW_COMPLEX == 0");
-#endif /*LV_DRAW_COMPLEX*/
-}
-
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.h
index 111bced52..d82ea51bd 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.h
@@ -13,7 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw_blend.h"
+#include "../lv_conf_internal.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_style.h"
 
 /*********************
  *      DEFINES
@@ -34,11 +37,14 @@ typedef struct {
     uint8_t raw_end     : 1;    /*Do not bother with perpendicular line ending if it's not visible for any reason*/
 } lv_draw_line_dsc_t;
 
+struct _lv_draw_ctx_t;
+
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
-//! @cond Doxygen_Suppress
+LV_ATTRIBUTE_FAST_MEM void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc);
+
 /**
  * Draw a line
  * @param point1 first point of the line
@@ -46,12 +52,9 @@ typedef struct {
  * @param clip the line will be drawn only in this area
  * @param dsc pointer to an initialized `lv_draw_line_dsc_t` variable
  */
-LV_ATTRIBUTE_FAST_MEM void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip,
-                                        const lv_draw_line_dsc_t * dsc);
+void lv_draw_line(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc, const lv_point_t * point1,
+                  const lv_point_t * point2);
 
-LV_ATTRIBUTE_FAST_MEM void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc);
-
-//! @endcond
 
 /**********************
  *      MACROS
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.c
index 0197f22d1..430fd56ae 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw_mask.h"
+#include "lv_draw.h"
 #if LV_DRAW_COMPLEX
 #include "../misc/lv_math.h"
 #include "../misc/lv_log.h"
@@ -41,6 +41,9 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_fade(lv_opa_t * mas
 LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_map(lv_opa_t * mask_buf, lv_coord_t abs_x,
                                                                  lv_coord_t abs_y, lv_coord_t len,
                                                                  lv_draw_mask_map_param_t * param);
+LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_polygon(lv_opa_t * mask_buf, lv_coord_t abs_x,
+                                                                     lv_coord_t abs_y, lv_coord_t len,
+                                                                     lv_draw_mask_polygon_param_t * param);
 
 LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_flat(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
                                                                lv_coord_t len,
@@ -140,16 +143,16 @@ LV_ATTRIBUTE_FAST_MEM lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf,
  * - `LV_DRAW_MASK_RES_CHANGED`: `mask_buf` has changed, it shows the desired opacity of each pixel in the given line
  */
 LV_ATTRIBUTE_FAST_MEM lv_draw_mask_res_t lv_draw_mask_apply_ids(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
-                                                                lv_coord_t len, const int16_t *ids, int16_t ids_count)
+                                                                lv_coord_t len, const int16_t * ids, int16_t ids_count)
 {
     bool changed = false;
     _lv_draw_mask_common_dsc_t * dsc;
 
-    for (int i = 0; i < ids_count; i++) {
+    for(int i = 0; i < ids_count; i++) {
         int16_t id = ids[i];
-        if (id == LV_MASK_ID_INV) continue;
+        if(id == LV_MASK_ID_INV) continue;
         dsc = LV_GC_ROOT(_lv_draw_mask_list[id]).param;
-        if (!dsc) continue;
+        if(!dsc) continue;
         lv_draw_mask_res_t res = LV_DRAW_MASK_RES_FULL_COVER;
         res = dsc->cb(mask_buf, abs_x, abs_y, len, dsc);
         if(res == LV_DRAW_MASK_RES_TRANSP) return LV_DRAW_MASK_RES_TRANSP;
@@ -219,6 +222,10 @@ void lv_draw_mask_free_param(void * p)
             }
         }
     }
+    else if(pdsc->type == LV_DRAW_MASK_TYPE_POLYGON) {
+        lv_draw_mask_polygon_param_t * poly_p = (lv_draw_mask_polygon_param_t *) p;
+        lv_mem_free(poly_p->cfg.points);
+    }
 }
 
 void _lv_draw_mask_cleanup(void)
@@ -252,10 +259,10 @@ bool lv_draw_mask_is_any(const lv_area_t * a)
 
     uint8_t i;
     for(i = 0; i < _LV_MASK_MAX_NUM; i++) {
-        _lv_draw_mask_common_dsc_t * comm_param =  LV_GC_ROOT(_lv_draw_mask_list[i]).param;
+        _lv_draw_mask_common_dsc_t * comm_param = LV_GC_ROOT(_lv_draw_mask_list[i]).param;
         if(comm_param == NULL) continue;
         if(comm_param->type == LV_DRAW_MASK_TYPE_RADIUS) {
-            lv_draw_mask_radius_param_t * radius_param =  LV_GC_ROOT(_lv_draw_mask_list[i]).param;
+            lv_draw_mask_radius_param_t * radius_param = LV_GC_ROOT(_lv_draw_mask_list[i]).param;
             if(radius_param->cfg.outer) {
                 if(!_lv_area_is_out(a, &radius_param->cfg.rect, radius_param->cfg.radius)) return true;
             }
@@ -462,7 +469,7 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert
 
 /**
  * Initialize a fade mask.
- * @param param param pointer to a `lv_draw_mask_param_t` to initialize
+ * @param param pointer to an `lv_draw_mask_radius_param_t` to initialize
  * @param rect coordinates of the rectangle to affect (absolute coordinates)
  * @param radius radius of the rectangle
  * @param inv true: keep the pixels inside the rectangle; keep the pixels outside of the rectangle
@@ -471,9 +478,9 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area
 {
     lv_coord_t w = lv_area_get_width(rect);
     lv_coord_t h = lv_area_get_height(rect);
-    if(radius < 0) radius = 0;
     int32_t short_side = LV_MIN(w, h);
     if(radius > short_side >> 1) radius = short_side >> 1;
+    if(radius < 0) radius = 0;
 
     lv_area_copy(&param->cfg.rect, rect);
     param->cfg.radius = radius;
@@ -560,6 +567,31 @@ void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * c
     param->dsc.type = LV_DRAW_MASK_TYPE_MAP;
 }
 
+void lv_draw_mask_polygon_init(lv_draw_mask_polygon_param_t * param, const lv_point_t * points, uint16_t point_cnt)
+{
+    /*Join adjacent points if they are on the same coordinate*/
+    lv_point_t * p = lv_mem_alloc(point_cnt * sizeof(lv_point_t));
+    if(p == NULL) return;
+    uint16_t i;
+    uint16_t pcnt = 0;
+    p[0] = points[0];
+    for(i = 0; i < point_cnt - 1; i++) {
+        if(points[i].x != points[i + 1].x || points[i].y != points[i + 1].y) {
+            p[pcnt] = points[i];
+            pcnt++;
+        }
+    }
+    /*The first and the last points are also adjacent*/
+    if(points[0].x != points[point_cnt - 1].x || points[0].y != points[point_cnt - 1].y) {
+        p[pcnt] = points[point_cnt - 1];
+        pcnt++;
+    }
+    param->cfg.points = p;
+    param->cfg.point_cnt = pcnt;
+    param->dsc.cb = (lv_draw_mask_xcb_t)lv_draw_mask_polygon;
+    param->dsc.type = LV_DRAW_MASK_TYPE_POLYGON;
+}
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
@@ -1045,7 +1077,7 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_radius(lv_opa_t * m
        (abs_y >= rect.y1 + radius && abs_y <= rect.y2 - radius)) {
         if(outer == false) {
             /*Remove the edges*/
-            int32_t last =  rect.x1 - abs_x;
+            int32_t last = rect.x1 - abs_x;
             if(last > len) return LV_DRAW_MASK_RES_TRANSP;
             if(last >= 0) {
                 lv_memset_00(&mask_buf[0], last);
@@ -1063,7 +1095,7 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_radius(lv_opa_t * m
             int32_t first = rect.x1 - abs_x;
             if(first < 0) first = 0;
             if(first <= len) {
-                int32_t last =  rect.x2 - abs_x - first + 1;
+                int32_t last = rect.x2 - abs_x - first + 1;
                 if(first + last > len) last = len - first;
                 if(last >= 0) {
                     lv_memset_00(&mask_buf[first], last);
@@ -1218,6 +1250,79 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_map(lv_opa_t * mask
     return LV_DRAW_MASK_RES_CHANGED;
 }
 
+LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_polygon(lv_opa_t * mask_buf, lv_coord_t abs_x,
+                                                                     lv_coord_t abs_y, lv_coord_t len,
+                                                                     lv_draw_mask_polygon_param_t * param)
+{
+    uint16_t i;
+    struct {
+        lv_point_t p1;
+        lv_point_t p2;
+    } lines[2], tmp;
+    uint16_t line_cnt = 0;
+    lv_memset_00(&lines, sizeof(lines));
+    int psign_prev = 0;
+    for(i = 0; i < param->cfg.point_cnt; i++) {
+        lv_point_t p1 = param->cfg.points[i];
+        lv_point_t p2 = param->cfg.points[i + 1 < param->cfg.point_cnt ? i + 1 : 0];
+        int pdiff = p1.y - p2.y, psign = pdiff / LV_ABS(pdiff);
+        if(pdiff > 0) {
+            if(abs_y > p1.y || abs_y < p2.y) continue;
+            lines[line_cnt].p1 = p2;
+            lines[line_cnt].p2 = p1;
+        }
+        else {
+            if(abs_y < p1.y || abs_y > p2.y) continue;
+            lines[line_cnt].p1 = p1;
+            lines[line_cnt].p2 = p2;
+        }
+        if(psign_prev && psign_prev == psign) continue;
+        psign_prev = psign;
+        line_cnt++;
+        if(line_cnt == 2) break;
+    }
+    if(line_cnt != 2) return LV_DRAW_MASK_RES_TRANSP;
+    if(lines[0].p1.x > lines[1].p1.x || lines[0].p2.x > lines[1].p2.x) {
+        tmp = lines[0];
+        lines[0] = lines[1];
+        lines[1] = tmp;
+    }
+    lv_draw_mask_line_param_t line_p;
+    lv_draw_mask_line_points_init(&line_p, lines[0].p1.x, lines[0].p1.y, lines[0].p2.x, lines[0].p2.y,
+                                  LV_DRAW_MASK_LINE_SIDE_RIGHT);
+    if(line_p.steep == 0 && line_p.flat) {
+        lv_coord_t x1 = LV_MIN(lines[0].p1.x, lines[0].p2.x);
+        lv_coord_t x2 = LV_MAX(lines[0].p1.x, lines[0].p2.x);
+        for(i = 0; i < len; i++) {
+            mask_buf[i] = mask_mix(mask_buf[i], (abs_x + i >= x1 && abs_x + i <= x2) * 0xFF);
+        }
+        lv_draw_mask_free_param(&line_p);
+        return LV_DRAW_MASK_RES_CHANGED;
+    }
+    lv_draw_mask_res_t res1 = lv_draw_mask_line(mask_buf, abs_x, abs_y, len, &line_p);
+    lv_draw_mask_free_param(&line_p);
+    if(res1 == LV_DRAW_MASK_RES_TRANSP) {
+        return LV_DRAW_MASK_RES_TRANSP;
+    }
+    lv_draw_mask_line_points_init(&line_p, lines[1].p1.x, lines[1].p1.y, lines[1].p2.x, lines[1].p2.y,
+                                  LV_DRAW_MASK_LINE_SIDE_LEFT);
+    if(line_p.steep == 0 && line_p.flat) {
+        lv_coord_t x1 = LV_MIN(lines[1].p1.x, lines[1].p2.x);
+        lv_coord_t x2 = LV_MAX(lines[1].p1.x, lines[1].p2.x);
+        for(i = 0; i < len; i++) {
+            mask_buf[i] = mask_mix(mask_buf[i], (abs_x + i >= x1 && abs_x + i <= x2) * 0xFF);
+        }
+        lv_draw_mask_free_param(&line_p);
+        return LV_DRAW_MASK_RES_CHANGED;
+    }
+    lv_draw_mask_res_t res2 = lv_draw_mask_line(mask_buf, abs_x, abs_y, len, &line_p);
+    lv_draw_mask_free_param(&line_p);
+    if(res2 == LV_DRAW_MASK_RES_TRANSP) {
+        return LV_DRAW_MASK_RES_TRANSP;
+    }
+    if(res1 == LV_DRAW_MASK_RES_CHANGED || res2 == LV_DRAW_MASK_RES_CHANGED) return LV_DRAW_MASK_RES_CHANGED;
+    return res1;
+}
 /**
  * Initialize the circle drawing
  * @param c pointer to a point. The coordinates will be calculated here
@@ -1275,10 +1380,10 @@ static void circ_calc_aa4(_lv_draw_mask_radius_circle_dsc_t * c, lv_coord_t radi
 
     /*Special case, handle manually*/
     if(radius == 1) {
-        c->cir_opa[0] =  180;
-        c->opa_start_on_y[0] =  0;
-        c->opa_start_on_y[1] =  1;
-        c->x_start_on_y[0] =  0;
+        c->cir_opa[0] = 180;
+        c->opa_start_on_y[0] = 0;
+        c->opa_start_on_y[1] = 1;
+        c->x_start_on_y[0] = 0;
         return;
     }
 
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.h
index 123cd9163..b6ec14f23 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.h
@@ -25,9 +25,6 @@ extern "C" {
 #define LV_MASK_ID_INV  (-1)
 #if LV_DRAW_COMPLEX
 # define _LV_MASK_MAX_NUM     16
-# ifndef _LV_MASK_BUF_MAX_SIZE
-#  define _LV_MASK_BUF_MAX_SIZE  2048    /*Should be >= than the max hor res*/
-# endif
 #else
 # define _LV_MASK_MAX_NUM     1
 #endif
@@ -76,6 +73,7 @@ enum {
     LV_DRAW_MASK_TYPE_RADIUS,
     LV_DRAW_MASK_TYPE_FADE,
     LV_DRAW_MASK_TYPE_MAP,
+    LV_DRAW_MASK_TYPE_POLYGON,
 };
 
 typedef uint8_t lv_draw_mask_type_t;
@@ -207,6 +205,16 @@ typedef struct _lv_draw_mask_map_param_t {
     } cfg;
 } lv_draw_mask_map_param_t;
 
+typedef struct {
+    /*The first element must be the common descriptor*/
+    _lv_draw_mask_common_dsc_t dsc;
+
+    struct {
+        lv_point_t * points;
+        uint16_t point_cnt;
+    } cfg;
+} lv_draw_mask_polygon_param_t;
+
 
 /**********************
  * GLOBAL PROTOTYPES
@@ -250,7 +258,7 @@ LV_ATTRIBUTE_FAST_MEM lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf,
  * - `LV_DRAW_MASK_RES_CHANGED`: `mask_buf` has changed, it shows the desired opacity of each pixel in the given line
  */
 LV_ATTRIBUTE_FAST_MEM lv_draw_mask_res_t lv_draw_mask_apply_ids(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
-                                                                lv_coord_t len, const int16_t *ids, int16_t ids_count);
+                                                                lv_coord_t len, const int16_t * ids, int16_t ids_count);
 
 //! @endcond
 
@@ -343,7 +351,7 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert
 
 /**
  * Initialize a fade mask.
- * @param param param pointer to a `lv_draw_mask_param_t` to initialize
+ * @param param pointer to an `lv_draw_mask_radius_param_t` to initialize
  * @param rect coordinates of the rectangle to affect (absolute coordinates)
  * @param radius radius of the rectangle
  * @param inv true: keep the pixels inside the rectangle; keep the pixels outside of the rectangle
@@ -371,6 +379,8 @@ void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t *
  */
 void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * coords, const lv_opa_t * map);
 
+void lv_draw_mask_polygon_init(lv_draw_mask_polygon_param_t * param, const lv_point_t * points, uint16_t point_cnt);
+
 #endif /*LV_DRAW_COMPLEX*/
 
 /**********************
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.c
index 5778737fe..8cb428824 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.c
@@ -6,20 +6,13 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw.h"
 #include "lv_draw_rect.h"
-#include "lv_draw_blend.h"
-#include "lv_draw_mask.h"
-#include "../misc/lv_math.h"
-#include "../misc/lv_txt_ap.h"
-#include "../core/lv_refr.h"
 #include "../misc/lv_assert.h"
 
 /*********************
  *      DEFINES
  *********************/
-#define SHADOW_UPSCALE_SHIFT   6
-#define SHADOW_ENHANCE          1
-#define SPLIT_LIMIT             50
 
 /**********************
  *      TYPEDEFS
@@ -28,43 +21,10 @@
 /**********************
  *  STATIC PROTOTYPES
  **********************/
-#if LV_USE_EXTERNAL_RENDERER == 0
-LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_area_t * clip_area,
-                                          const lv_draw_rect_dsc_t * dsc);
-LV_ATTRIBUTE_FAST_MEM static void draw_bg_img(const lv_area_t * coords, const lv_area_t * clip,
-                                              const lv_draw_rect_dsc_t * dsc);
-LV_ATTRIBUTE_FAST_MEM static void draw_border(const lv_area_t * coords, const lv_area_t * clip,
-                                              const lv_draw_rect_dsc_t * dsc);
-
-static void draw_outline(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc);
-
-#if LV_DRAW_COMPLEX
-LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip,
-                                              const lv_draw_rect_dsc_t * dsc);
-LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coords,  uint16_t * sh_buf, lv_coord_t s,
-                                                         lv_coord_t r);
-LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, uint16_t * sh_ups_buf);
-#endif
-
-void draw_border_generic(const lv_area_t * clip_area, const lv_area_t * outer_area, const lv_area_t * inner_area,
-                         lv_coord_t rout, lv_coord_t rin, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
-
-static void draw_border_simple(const lv_area_t * clip, const lv_area_t * outer_area, const lv_area_t * inner_area,
-                               lv_color_t color, lv_opa_t opa);
-
-#if LV_DRAW_COMPLEX
-    LV_ATTRIBUTE_FAST_MEM static inline lv_color_t grad_get(const lv_draw_rect_dsc_t * dsc, lv_coord_t s, lv_coord_t i);
-#endif
-#endif
 
 /**********************
  *  STATIC VARIABLES
  **********************/
-#if defined(LV_SHADOW_CACHE_SIZE) && LV_SHADOW_CACHE_SIZE > 0
-    static uint8_t sh_cache[LV_SHADOW_CACHE_SIZE * LV_SHADOW_CACHE_SIZE];
-    static int32_t sh_cache_size = -1;
-    static int32_t sh_cache_r = -1;
-#endif
 
 /**********************
  *      MACROS
@@ -78,10 +38,14 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc)
 {
     lv_memset_00(dsc, sizeof(lv_draw_rect_dsc_t));
     dsc->bg_color = lv_color_white();
-    dsc->bg_grad_color = lv_color_black();
+#if __STDC_VERSION__ < 201112L
+    dsc->bg_grad.stops[0].color = lv_color_white();
+#endif
+    dsc->bg_grad.stops[1].color = lv_color_black();
+    dsc->bg_grad.stops[1].frac = 0xFF;
+    dsc->bg_grad.stops_count = 2;
     dsc->border_color = lv_color_black();
     dsc->shadow_color = lv_color_black();
-    dsc->bg_grad_color_stop = 0xFF;
     dsc->bg_img_symbol_font = LV_FONT_DEFAULT;
     dsc->bg_opa = LV_OPA_COVER;
     dsc->bg_img_opa = LV_OPA_COVER;
@@ -91,26 +55,17 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc)
     dsc->border_side = LV_BORDER_SIDE_FULL;
 }
 
-#if LV_USE_EXTERNAL_RENDERER == 0
 /**
  * Draw a rectangle
  * @param coords the coordinates of the rectangle
  * @param mask the rectangle will be drawn only in this mask
  * @param dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
  */
-void lv_draw_rect(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
+void lv_draw_rect(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
 {
     if(lv_area_get_height(coords) < 1 || lv_area_get_width(coords) < 1) return;
-#if LV_DRAW_COMPLEX
-    draw_shadow(coords, clip, dsc);
-#endif
 
-    draw_bg(coords, clip, dsc);
-    draw_bg_img(coords, clip, dsc);
-
-    draw_border(coords, clip, dsc);
-
-    draw_outline(coords, clip, dsc);
+    draw_ctx->draw_rect(draw_ctx, dsc, coords);
 
     LV_ASSERT_MEM_INTEGRITY();
 }
@@ -118,1224 +73,3 @@ void lv_draw_rect(const lv_area_t * coords, const lv_area_t * clip, const lv_dra
 /**********************
  *   STATIC FUNCTIONS
  **********************/
-
-LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_area_t * clip_area,
-                                          const lv_draw_rect_dsc_t * dsc)
-{
-    if(dsc->bg_opa <= LV_OPA_MIN) return;
-
-    lv_area_t coords_bg;
-    lv_area_copy(&coords_bg, coords);
-
-    /*If the border fully covers make the bg area 1px smaller to avoid artifacts on the corners*/
-    if(dsc->border_width > 1 && dsc->border_opa >= LV_OPA_MAX && dsc->radius != 0) {
-        coords_bg.x1 += (dsc->border_side & LV_BORDER_SIDE_LEFT) ? 1 : 0;
-        coords_bg.y1 += (dsc->border_side & LV_BORDER_SIDE_TOP) ? 1 : 0;
-        coords_bg.x2 -= (dsc->border_side & LV_BORDER_SIDE_RIGHT) ? 1 : 0;
-        coords_bg.y2 -= (dsc->border_side & LV_BORDER_SIDE_BOTTOM) ? 1 : 0;
-    }
-
-    lv_opa_t opa = dsc->bg_opa >= LV_OPA_MAX ? LV_OPA_COVER : dsc->bg_opa;
-    lv_grad_dir_t grad_dir = dsc->bg_grad_dir;
-    if(dsc->bg_color.full == dsc->bg_grad_color.full) grad_dir = LV_GRAD_DIR_NONE;
-
-    bool mask_any = lv_draw_mask_is_any(&coords_bg);
-
-    /*Most simple case: just a plain rectangle*/
-    if(!mask_any && dsc->radius == 0 && (grad_dir == LV_GRAD_DIR_NONE)) {
-        _lv_blend_fill(clip_area, &coords_bg, dsc->bg_color, NULL,
-                       LV_DRAW_MASK_RES_FULL_COVER, opa, dsc->blend_mode);
-        return;
-    }
-
-    /*Complex case: there is gradient, mask, or radius*/
-#if LV_DRAW_COMPLEX == 0
-    LV_LOG_WARN("Can't draw complex rectangle because LV_DRAW_COMPLEX = 0");
-#else
-    /*Get clipped fill area which is the real draw area.
-     *It is always the same or inside `fill_area`*/
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, &coords_bg, clip_area)) return;
-
-    /*Get the real radius. Can't be larger than the half of the shortest side */
-    lv_coord_t coords_w = lv_area_get_width(&coords_bg);
-    lv_coord_t coords_h = lv_area_get_height(&coords_bg);
-    int32_t short_side = LV_MIN(coords_w, coords_h);
-    int32_t rout = LV_MIN(dsc->radius, short_side >> 1);
-
-    /*Add a radius mask if there is radius*/
-    int32_t draw_area_w = lv_area_get_width(&draw_area);
-    int16_t mask_rout_id = LV_MASK_ID_INV;
-    lv_opa_t * mask_buf = NULL;
-    lv_draw_mask_radius_param_t mask_rout_param;
-    if(rout > 0 || mask_any) {
-        mask_buf = lv_mem_buf_get(draw_area_w);
-        lv_draw_mask_radius_init(&mask_rout_param, &coords_bg, rout, false);
-        mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
-    }
-
-    /*In case of horizontal gradient pre-compute a line with a gradient*/
-    lv_color_t * grad_map = NULL;
-    lv_color_t * grad_map_ofs = NULL;
-    if(grad_dir == LV_GRAD_DIR_HOR) {
-        grad_map = lv_mem_buf_get(coords_w * sizeof(lv_color_t));
-        int32_t i;
-        for(i = 0; i < coords_w; i++) {
-            grad_map[i] = grad_get(dsc, coords_w, i);
-        }
-        grad_map_ofs = grad_map;
-        if(dsc->bg_grad_dir == LV_GRAD_DIR_HOR) grad_map_ofs += draw_area.x1 - coords_bg.x1;
-    }
-
-    int32_t h;
-    lv_draw_mask_res_t mask_res;
-    lv_area_t blend_area;
-    blend_area.x1 = draw_area.x1;
-    blend_area.x2 = draw_area.x2;
-
-    /*There is another mask too. Draw line by line. */
-    if(mask_any) {
-        for(h = draw_area.y1; h <= draw_area.y2; h++) {
-            blend_area.y1 = h;
-            blend_area.y2 = h;
-
-            /* Initialize the mask to opa instead of 0xFF and blend with LV_OPA_COVER.
-             * It saves calculating the final opa in _lv_blend_fill*/
-            lv_memset(mask_buf, opa, draw_area_w);
-            mask_res = lv_draw_mask_apply(mask_buf, draw_area.x1, h, draw_area_w);
-            if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-
-            if(grad_dir == LV_GRAD_DIR_NONE) {
-                _lv_blend_fill(clip_area, &blend_area, dsc->bg_color, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_HOR) {
-                _lv_blend_map(clip_area, &blend_area, grad_map_ofs, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_VER) {
-                lv_color_t c = grad_get(dsc, coords_h, h - coords_bg.y1);
-                _lv_blend_fill(clip_area, &blend_area, c, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-        }
-        goto bg_clean_up;
-    }
-
-
-    /* Draw the top of the rectangle line by line and mirror it to the bottom.
-     * If there is no radius this cycle won't run because `h` is always `>= h_end`*/
-    blend_area.x1 = draw_area.x1;
-    blend_area.x2 = draw_area.x2;
-    for(h = 0; h < rout; h++) {
-        lv_coord_t top_y = coords_bg.y1 + h;
-        lv_coord_t bottom_y = coords_bg.y2 - h;
-        if(top_y < draw_area.y1 && bottom_y > draw_area.y2) continue;   /*This line is clipped now*/
-
-        /* Initialize the mask to opa instead of 0xFF and blend with LV_OPA_COVER.
-         * It saves calculating the final opa in _lv_blend_fill*/
-        lv_memset(mask_buf, opa, draw_area_w);
-        mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, top_y, draw_area_w);
-
-        if(top_y >= draw_area.y1) {
-            blend_area.y1 = top_y;
-            blend_area.y2 = top_y;
-
-            if(grad_dir == LV_GRAD_DIR_NONE) {
-                _lv_blend_fill(clip_area, &blend_area, dsc->bg_color, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_HOR) {
-                _lv_blend_map(clip_area, &blend_area, grad_map_ofs, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_VER) {
-                lv_color_t c = grad_get(dsc, coords_h, top_y - coords_bg.y1);
-                _lv_blend_fill(clip_area, &blend_area, c, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-        }
-
-        if(bottom_y <= draw_area.y2) {
-            blend_area.y1 = bottom_y;
-            blend_area.y2 = bottom_y;
-
-            if(grad_dir == LV_GRAD_DIR_NONE) {
-                _lv_blend_fill(clip_area, &blend_area, dsc->bg_color, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_HOR) {
-                _lv_blend_map(clip_area, &blend_area, grad_map_ofs, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_VER) {
-                lv_color_t c = grad_get(dsc, coords_h, bottom_y - coords_bg.y1);
-                _lv_blend_fill(clip_area, &blend_area, c, mask_buf, mask_res, LV_OPA_COVER, dsc->blend_mode);
-            }
-        }
-    }
-
-    /* Draw the center of the rectangle.*/
-
-    /*If no other masks and no gradient, the center is a simple rectangle*/
-    if(!mask_any && grad_dir == LV_GRAD_DIR_NONE) {
-        blend_area.y1 = coords_bg.y1 + rout;
-        blend_area.y2 = coords_bg.y2 - rout;
-        _lv_blend_fill(clip_area, &blend_area, dsc->bg_color, mask_buf, LV_DRAW_MASK_RES_FULL_COVER, opa, dsc->blend_mode);
-    }
-    /*With gradient and/or mask draw line by line*/
-    else {
-        mask_res = LV_DRAW_MASK_RES_FULL_COVER;
-        int32_t h_end = coords_bg.y2 - rout;
-        for(h = coords_bg.y1 + rout; h <= h_end; h++) {
-            /*If there is no other mask do not apply mask as in the center there is no radius to mask*/
-            if(mask_any) {
-                lv_memset_ff(mask_buf, draw_area_w);
-                mask_res = lv_draw_mask_apply(mask_buf, draw_area.x1, h, draw_area_w);
-            }
-
-            blend_area.y1 = h;
-            blend_area.y2 = h;
-            if(grad_dir == LV_GRAD_DIR_NONE) {
-                _lv_blend_fill(clip_area, &blend_area, dsc->bg_color, mask_buf, mask_res, opa, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_HOR) {
-                _lv_blend_map(clip_area, &blend_area, grad_map_ofs, mask_buf, mask_res, opa, dsc->blend_mode);
-            }
-            else if(grad_dir == LV_GRAD_DIR_VER) {
-                lv_color_t c = grad_get(dsc, coords_h, h - coords_bg.y1);
-                _lv_blend_fill(clip_area, &blend_area, c, mask_buf, mask_res, opa, dsc->blend_mode);
-            }
-        }
-    }
-
-
-bg_clean_up:
-    if(grad_map) lv_mem_buf_release(grad_map);
-    if(mask_buf) lv_mem_buf_release(mask_buf);
-    if(mask_rout_id != LV_MASK_ID_INV) {
-        lv_draw_mask_remove_id(mask_rout_id);
-        lv_draw_mask_free_param(&mask_rout_param);
-    }
-
-#endif
-}
-
-LV_ATTRIBUTE_FAST_MEM static void draw_bg_img(const lv_area_t * coords, const lv_area_t * clip,
-                                              const lv_draw_rect_dsc_t * dsc)
-{
-    if(dsc->bg_img_src == NULL) return;
-    if(dsc->bg_img_opa <= LV_OPA_MIN) return;
-
-    lv_img_src_t src_type = lv_img_src_get_type(dsc->bg_img_src);
-    if(src_type == LV_IMG_SRC_SYMBOL) {
-        lv_point_t size;
-        lv_txt_get_size(&size, dsc->bg_img_src, dsc->bg_img_symbol_font, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE);
-        lv_area_t a;
-        a.x1 = coords->x1 + lv_area_get_width(coords) / 2 - size.x / 2;
-        a.x2 = a.x1 + size.x - 1;
-        a.y1 = coords->y1 + lv_area_get_height(coords) / 2 - size.y / 2;
-        a.y2 = a.y1 + size.y - 1;
-
-        lv_draw_label_dsc_t label_draw_dsc;
-        lv_draw_label_dsc_init(&label_draw_dsc);
-        label_draw_dsc.font = dsc->bg_img_symbol_font;
-        label_draw_dsc.color = dsc->bg_img_recolor;
-        label_draw_dsc.opa = dsc->bg_img_opa;
-        lv_draw_label(&a, clip, &label_draw_dsc, dsc->bg_img_src, NULL);
-    }
-    else {
-        lv_img_header_t header;
-        lv_res_t res = lv_img_decoder_get_info(dsc->bg_img_src, &header);
-        if(res != LV_RES_OK) {
-            LV_LOG_WARN("Couldn't read the background image");
-            return;
-        }
-
-        lv_draw_img_dsc_t img_dsc;
-        lv_draw_img_dsc_init(&img_dsc);
-        img_dsc.blend_mode = dsc->blend_mode;
-        img_dsc.recolor = dsc->bg_img_recolor;
-        img_dsc.recolor_opa = dsc->bg_img_recolor_opa;
-        img_dsc.opa = dsc->bg_img_opa;
-
-        /*Center align*/
-        if(dsc->bg_img_tiled == false) {
-            lv_area_t area;
-            area.x1 = coords->x1 + lv_area_get_width(coords) / 2 - header.w / 2;
-            area.y1 = coords->y1 + lv_area_get_height(coords) / 2 - header.h / 2;
-            area.x2 = area.x1 + header.w - 1;
-            area.y2 = area.y1 + header.h - 1;
-
-            lv_draw_img(&area, clip, dsc->bg_img_src, &img_dsc);
-        }
-        else {
-            lv_area_t area;
-            area.y1 = coords->y1;
-            area.y2 = area.y1 + header.h - 1;
-
-            for(; area.y1 <= coords->y2; area.y1 += header.h, area.y2 += header.h) {
-
-                area.x1 = coords->x1;
-                area.x2 = area.x1 + header.w - 1;
-                for(; area.x1 <= coords->x2; area.x1 += header.w, area.x2 += header.w) {
-                    lv_draw_img(&area, clip, dsc->bg_img_src, &img_dsc);
-                }
-            }
-        }
-    }
-}
-
-LV_ATTRIBUTE_FAST_MEM static void draw_border(const lv_area_t * coords, const lv_area_t * clip,
-                                              const lv_draw_rect_dsc_t * dsc)
-{
-    if(dsc->border_opa <= LV_OPA_MIN) return;
-    if(dsc->border_width == 0) return;
-    if(dsc->border_side == LV_BORDER_SIDE_NONE) return;
-    if(dsc->border_post) return;
-
-    int32_t coords_w = lv_area_get_width(coords);
-    int32_t coords_h = lv_area_get_height(coords);
-    int32_t rout = dsc->radius;
-    int32_t short_side = LV_MIN(coords_w, coords_h);
-    if(rout > short_side >> 1) rout = short_side >> 1;
-
-    /*Get the inner area*/
-    lv_area_t area_inner;
-    lv_area_copy(&area_inner, coords);
-    area_inner.x1 += ((dsc->border_side & LV_BORDER_SIDE_LEFT) ? dsc->border_width : - (dsc->border_width + rout));
-    area_inner.x2 -= ((dsc->border_side & LV_BORDER_SIDE_RIGHT) ? dsc->border_width : - (dsc->border_width + rout));
-    area_inner.y1 += ((dsc->border_side & LV_BORDER_SIDE_TOP) ? dsc->border_width : - (dsc->border_width + rout));
-    area_inner.y2 -= ((dsc->border_side & LV_BORDER_SIDE_BOTTOM) ? dsc->border_width : - (dsc->border_width + rout));
-
-    lv_coord_t rin = rout - dsc->border_width;
-    if(rin < 0) rin = 0;
-
-    draw_border_generic(clip, coords, &area_inner, rout, rin, dsc->border_color, dsc->border_opa, dsc->blend_mode);
-
-}
-
-
-#if LV_DRAW_COMPLEX
-LV_ATTRIBUTE_FAST_MEM static inline lv_color_t grad_get(const lv_draw_rect_dsc_t * dsc, lv_coord_t s, lv_coord_t i)
-{
-    int32_t min = (dsc->bg_main_color_stop * s) >> 8;
-    if(i <= min) return dsc->bg_color;
-
-    int32_t max = (dsc->bg_grad_color_stop * s) >> 8;
-    if(i >= max) return dsc->bg_grad_color;
-
-    int32_t d = dsc->bg_grad_color_stop - dsc->bg_main_color_stop;
-    d = (s * d) >> 8;
-    i -= min;
-    lv_opa_t mix = (i * 255) / d;
-    return lv_color_mix(dsc->bg_grad_color, dsc->bg_color, mix);
-}
-
-LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip,
-                                              const lv_draw_rect_dsc_t * dsc)
-{
-    /*Check whether the shadow is visible*/
-    if(dsc->shadow_width == 0) return;
-    if(dsc->shadow_opa <= LV_OPA_MIN) return;
-
-    if(dsc->shadow_width == 1 && dsc->shadow_spread <= 0 &&
-       dsc->shadow_ofs_x == 0 && dsc->shadow_ofs_y == 0) {
-        return;
-    }
-
-    /*Calculate the rectangle which is blurred to get the shadow in `shadow_area`*/
-    lv_area_t core_area;
-    core_area.x1 = coords->x1  + dsc->shadow_ofs_x - dsc->shadow_spread;
-    core_area.x2 = coords->x2  + dsc->shadow_ofs_x + dsc->shadow_spread;
-    core_area.y1 = coords->y1  + dsc->shadow_ofs_y - dsc->shadow_spread;
-    core_area.y2 = coords->y2  + dsc->shadow_ofs_y + dsc->shadow_spread;
-
-    /*Calculate the bounding box of the shadow*/
-    lv_area_t shadow_area;
-    shadow_area.x1 = core_area.x1 - dsc->shadow_width / 2 - 1;
-    shadow_area.x2 = core_area.x2 + dsc->shadow_width / 2 + 1;
-    shadow_area.y1 = core_area.y1 - dsc->shadow_width / 2 - 1;
-    shadow_area.y2 = core_area.y2 + dsc->shadow_width / 2 + 1;
-
-    lv_opa_t opa = dsc->shadow_opa;
-    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
-
-    /*Get clipped draw area which is the real draw area.
-     *It is always the same or inside `shadow_area`*/
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, &shadow_area, clip)) return;
-
-    /*Consider 1 px smaller bg to be sure the edge will be covered by the shadow*/
-    lv_area_t bg_area;
-    lv_area_copy(&bg_area, coords);
-    lv_area_increase(&bg_area, -1, -1);
-
-    /*Get the clamped radius*/
-    int32_t r_bg = dsc->radius;
-    lv_coord_t short_side = LV_MIN(lv_area_get_width(&bg_area), lv_area_get_height(&bg_area));
-    if(r_bg > short_side >> 1) r_bg = short_side >> 1;
-
-    /*Get the clamped radius*/
-    int32_t r_sh = dsc->radius;
-    short_side = LV_MIN(lv_area_get_width(&core_area), lv_area_get_height(&core_area));
-    if(r_sh > short_side >> 1) r_sh = short_side >> 1;
-
-    /*Get how many pixels are affected by the blur on the corners*/
-    int32_t corner_size = dsc->shadow_width  + r_sh;
-
-    lv_opa_t * sh_buf;
-
-#if LV_SHADOW_CACHE_SIZE
-    if(sh_cache_size == corner_size && sh_cache_r == r_sh) {
-        /*Use the cache if available*/
-        sh_buf = lv_mem_buf_get(corner_size * corner_size);
-        lv_memcpy(sh_buf, sh_cache, corner_size * corner_size);
-    }
-    else {
-        /*A larger buffer is required for calculation*/
-        sh_buf = lv_mem_buf_get(corner_size * corner_size * sizeof(uint16_t));
-        shadow_draw_corner_buf(&core_area, (uint16_t *)sh_buf, dsc->shadow_width, r_sh);
-
-        /*Cache the corner if it fits into the cache size*/
-        if((uint32_t)corner_size * corner_size < sizeof(sh_cache)) {
-            lv_memcpy(sh_cache, sh_buf, corner_size * corner_size);
-            sh_cache_size = corner_size;
-            sh_cache_r = r_sh;
-        }
-    }
-#else
-    sh_buf = lv_mem_buf_get(corner_size * corner_size * sizeof(uint16_t));
-    shadow_draw_corner_buf(&core_area, (uint16_t *)sh_buf, dsc->shadow_width, r_sh);
-#endif
-
-    /*Skip a lot of masking if the background will cover the shadow that would be masked out*/
-    bool mask_any = lv_draw_mask_is_any(&shadow_area);
-    bool simple = true;
-    if(mask_any || dsc->bg_opa < LV_OPA_COVER) simple = false;
-
-    /*Create a radius mask to clip remove shadow on the bg area*/
-    lv_draw_mask_res_t mask_res;
-
-    lv_draw_mask_radius_param_t mask_rout_param;
-    int16_t mask_rout_id = LV_MASK_ID_INV;
-    if(!simple) {
-        lv_draw_mask_radius_init(&mask_rout_param, &bg_area, r_bg, true);
-        mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
-    }
-    lv_opa_t * mask_buf = lv_mem_buf_get(lv_area_get_width(&shadow_area));
-    lv_area_t blend_area;
-    lv_area_t clip_area_sub;
-    lv_opa_t ** mask_act;
-    lv_opa_t * sh_buf_tmp;
-    lv_coord_t y;
-    bool simple_sub;
-
-    lv_coord_t w_half = shadow_area.x1 + lv_area_get_width(&shadow_area) / 2;
-    lv_coord_t h_half = shadow_area.y1 + lv_area_get_height(&shadow_area) / 2;
-
-    /*Draw the corners if they are on the current clip area and not fully covered by the bg*/
-
-    /*Top right corner*/
-    blend_area.x2 = shadow_area.x2;
-    blend_area.x1 = shadow_area.x2 - corner_size + 1;
-    blend_area.y1 = shadow_area.y1;
-    blend_area.y2 = shadow_area.y1 + corner_size - 1;
-    /*Do not overdraw the top other corners*/
-    blend_area.x1 = LV_MAX(blend_area.x1, w_half);
-    blend_area.y2 = LV_MIN(blend_area.y2, h_half);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (clip_area_sub.y1 - shadow_area.y1) * corner_size;
-        sh_buf_tmp += clip_area_sub.x1 - (shadow_area.x2 - corner_size + 1);
-
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-        mask_act = simple_sub ? &sh_buf_tmp : &mask_buf;
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, *mask_act, mask_res, dsc->shadow_opa, dsc->blend_mode);
-                sh_buf_tmp += corner_size;
-            }
-        }
-    }
-
-    /*Bottom right corner.
-     *Almost the same as top right just read the lines of `sh_buf` from then end*/
-    blend_area.x2 = shadow_area.x2;
-    blend_area.x1 = shadow_area.x2 - corner_size + 1;
-    blend_area.y1 = shadow_area.y2 - corner_size + 1;
-    blend_area.y2 = shadow_area.y2;
-    /*Do not overdraw the other corners*/
-    blend_area.x1 = LV_MAX(blend_area.x1, w_half);
-    blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (blend_area.y2 - clip_area_sub.y2) * corner_size;
-        sh_buf_tmp += clip_area_sub.x1 - (shadow_area.x2 - corner_size + 1);
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-        mask_act = simple_sub ? &sh_buf_tmp : &mask_buf;
-
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y2; y >= clip_area_sub.y1; y--) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, *mask_act, mask_res, dsc->shadow_opa, dsc->blend_mode);
-                sh_buf_tmp += corner_size;
-            }
-        }
-    }
-
-    /*Top side*/
-    blend_area.x1 = shadow_area.x1 + corner_size;
-    blend_area.x2 = shadow_area.x2 - corner_size;
-    blend_area.y1 = shadow_area.y1;
-    blend_area.y2 = shadow_area.y1 + corner_size - 1;
-    blend_area.y2 = LV_MIN(blend_area.y2, h_half);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (clip_area_sub.y1 - blend_area.y1) * corner_size;
-
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memset(mask_buf, sh_buf_tmp[0], w);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                    _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, mask_buf, mask_res, dsc->shadow_opa, dsc->blend_mode);
-                }
-                else {
-                    lv_opa_t line_opa = opa == LV_OPA_COVER ? sh_buf_tmp[0] : (sh_buf_tmp[0] * dsc->shadow_opa) >> 8;
-                    _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, NULL, LV_DRAW_MASK_RES_FULL_COVER, line_opa,
-                                   dsc->blend_mode);
-                }
-                sh_buf_tmp += corner_size;
-            }
-        }
-    }
-
-    /*Bottom side*/
-    blend_area.x1 = shadow_area.x1 + corner_size;
-    blend_area.x2 = shadow_area.x2 - corner_size;
-    blend_area.y1 = shadow_area.y2 - corner_size + 1;
-    blend_area.y2 = shadow_area.y2;
-    blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (blend_area.y2 - clip_area_sub.y2) * corner_size;
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y2; y >= clip_area_sub.y1; y--) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                /*Do not mask if out of the bg*/
-                if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-                else simple_sub = simple;
-
-                if(!simple_sub) {
-                    lv_memset(mask_buf, sh_buf_tmp[0], w);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                    _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, mask_buf, mask_res, dsc->shadow_opa, dsc->blend_mode);
-                }
-                else {
-                    lv_opa_t line_opa = opa == LV_OPA_COVER ? sh_buf_tmp[0] : (sh_buf_tmp[0] * dsc->shadow_opa) >> 8;
-                    _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, NULL, LV_DRAW_MASK_RES_FULL_COVER, line_opa,
-                                   dsc->blend_mode);
-
-                }
-                sh_buf_tmp += corner_size;
-            }
-        }
-    }
-
-    /*Right side*/
-    blend_area.x1 = shadow_area.x2 - corner_size + 1;
-    blend_area.x2 = shadow_area.x2;
-    blend_area.y1 = shadow_area.y1 + corner_size;
-    blend_area.y2 = shadow_area.y2 - corner_size;
-    /*Do not overdraw the other corners*/
-    blend_area.y1 = LV_MIN(blend_area.y1, h_half + 1);
-    blend_area.y2 = LV_MAX(blend_area.y2, h_half);
-    blend_area.x1 = LV_MAX(blend_area.x1, w_half);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (corner_size - 1) * corner_size;
-        sh_buf_tmp += clip_area_sub.x1 - (shadow_area.x2 - corner_size + 1);
-
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-        mask_act = simple_sub ? &sh_buf_tmp : &mask_buf;
-
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memcpy(mask_buf, sh_buf_tmp, w);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, *mask_act, mask_res, dsc->shadow_opa, dsc->blend_mode);
-            }
-        }
-    }
-
-    /*Mirror the shadow corner buffer horizontally*/
-    sh_buf_tmp = sh_buf ;
-    for(y = 0; y < corner_size; y++) {
-        int32_t x;
-        lv_opa_t * start = sh_buf_tmp;
-        lv_opa_t * end = sh_buf_tmp + corner_size - 1;
-        for(x = 0; x < corner_size / 2; x++) {
-            lv_opa_t tmp = *start;
-            *start = *end;
-            *end = tmp;
-
-            start++;
-            end--;
-        }
-        sh_buf_tmp += corner_size;
-    }
-
-    /*Left side*/
-    blend_area.x1 = shadow_area.x1;
-    blend_area.x2 = shadow_area.x1 + corner_size - 1;
-    blend_area.y1 = shadow_area.y1 + corner_size;
-    blend_area.y2 = shadow_area.y2 - corner_size;
-    /*Do not overdraw the other corners*/
-    blend_area.y1 = LV_MIN(blend_area.y1, h_half + 1);
-    blend_area.y2 = LV_MAX(blend_area.y2, h_half);
-    blend_area.x2 = LV_MIN(blend_area.x2, w_half - 1);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (corner_size - 1) * corner_size;
-        sh_buf_tmp += clip_area_sub.x1 - blend_area.x1;
-
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-        mask_act = simple_sub ? &sh_buf_tmp : &mask_buf;
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memcpy(mask_buf, sh_buf_tmp, w);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, *mask_act, mask_res, dsc->shadow_opa, dsc->blend_mode);
-            }
-        }
-    }
-
-    /*Top left corner*/
-    blend_area.x1 = shadow_area.x1;
-    blend_area.x2 = shadow_area.x1 + corner_size - 1;
-    blend_area.y1 = shadow_area.y1;
-    blend_area.y2 = shadow_area.y1 + corner_size - 1;
-    /*Do not overdraw the other corners*/
-    blend_area.x2 = LV_MIN(blend_area.x2, w_half - 1);
-    blend_area.y2 = LV_MIN(blend_area.y2, h_half);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (clip_area_sub.y1 - blend_area.y1) * corner_size;
-        sh_buf_tmp += clip_area_sub.x1 - blend_area.x1;
-
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-        mask_act = simple_sub ? &sh_buf_tmp : &mask_buf;
-
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, *mask_act, mask_res, dsc->shadow_opa, dsc->blend_mode);
-                sh_buf_tmp += corner_size;
-            }
-        }
-    }
-
-    /*Bottom left corner.
-     *Almost the same as bottom right just read the lines of `sh_buf` from then end*/
-    blend_area.x1 = shadow_area.x1 ;
-    blend_area.x2 = shadow_area.x1 + corner_size - 1;
-    blend_area.y1 = shadow_area.y2 - corner_size + 1;
-    blend_area.y2 = shadow_area.y2;
-    /*Do not overdraw the other corners*/
-    blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1);
-    blend_area.x2 = LV_MIN(blend_area.x2, w_half - 1);
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        sh_buf_tmp = sh_buf;
-        sh_buf_tmp += (blend_area.y2 - clip_area_sub.y2) * corner_size;
-        sh_buf_tmp += clip_area_sub.x1 - blend_area.x1;
-
-        /*Do not mask if out of the bg*/
-        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
-        else simple_sub = simple;
-        mask_act = simple_sub ? &sh_buf_tmp : &mask_buf;
-        if(w > 0) {
-            mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
-            for(y = clip_area_sub.y2; y >= clip_area_sub.y1; y--) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                if(!simple_sub) {
-                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
-                    mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                    if(mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask_res = LV_DRAW_MASK_RES_CHANGED;
-                }
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, *mask_act, mask_res, dsc->shadow_opa, dsc->blend_mode);
-                sh_buf_tmp += corner_size;
-            }
-        }
-    }
-
-    /*Draw the center rectangle.*/
-    blend_area.x1 = shadow_area.x1 + corner_size ;
-    blend_area.x2 = shadow_area.x2 - corner_size;
-    blend_area.y1 = shadow_area.y1 + corner_size;
-    blend_area.y2 = shadow_area.y2 - corner_size;
-
-    if(_lv_area_intersect(&clip_area_sub, &blend_area, clip) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
-        lv_coord_t w = lv_area_get_width(&clip_area_sub);
-        if(w > 0) {
-            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
-                blend_area.y1 = y;
-                blend_area.y2 = y;
-
-                lv_memset_ff(mask_buf, w);
-                mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
-                _lv_blend_fill(&clip_area_sub, &blend_area, dsc->shadow_color, mask_buf, mask_res, dsc->shadow_opa, dsc->blend_mode);
-            }
-        }
-    }
-
-    if(!simple) {
-        lv_draw_mask_free_param(&mask_rout_param);
-        lv_draw_mask_remove_id(mask_rout_id);
-    }
-    lv_mem_buf_release(sh_buf);
-    lv_mem_buf_release(mask_buf);
-}
-
-/**
- * Calculate a blurred corner
- * @param coords Coordinates of the shadow
- * @param sh_buf a buffer to store the result. Its size should be `(sw + r)^2 * 2`
- * @param sw shadow width
- * @param r radius
- */
-LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coords, uint16_t * sh_buf, lv_coord_t sw,
-                                                         lv_coord_t r)
-{
-    int32_t sw_ori = sw;
-    int32_t size = sw_ori  + r;
-
-    lv_area_t sh_area;
-    lv_area_copy(&sh_area, coords);
-    sh_area.x2 = sw / 2 + r - 1  - ((sw & 1) ? 0 : 1);
-    sh_area.y1 = sw / 2 + 1;
-
-    sh_area.x1 = sh_area.x2 - lv_area_get_width(coords);
-    sh_area.y2 = sh_area.y1 + lv_area_get_height(coords);
-
-    lv_draw_mask_radius_param_t mask_param;
-    lv_draw_mask_radius_init(&mask_param, &sh_area, r, false);
-
-#if SHADOW_ENHANCE
-    /*Set half shadow width width because blur will be repeated*/
-    if(sw_ori == 1) sw = 1;
-    else sw = sw_ori >> 1;
-#endif
-
-    int32_t y;
-    lv_opa_t * mask_line = lv_mem_buf_get(size);
-    uint16_t * sh_ups_tmp_buf = (uint16_t *)sh_buf;
-    for(y = 0; y < size; y++) {
-        lv_memset_ff(mask_line, size);
-        lv_draw_mask_res_t mask_res = mask_param.dsc.cb(mask_line, 0, y, size, &mask_param);
-        if(mask_res == LV_DRAW_MASK_RES_TRANSP) {
-            lv_memset_00(sh_ups_tmp_buf, size * sizeof(sh_ups_tmp_buf[0]));
-        }
-        else {
-            int32_t i;
-            sh_ups_tmp_buf[0] = (mask_line[0] << SHADOW_UPSCALE_SHIFT) / sw;
-            for(i = 1; i < size; i++) {
-                if(mask_line[i] == mask_line[i - 1]) sh_ups_tmp_buf[i] = sh_ups_tmp_buf[i - 1];
-                else  sh_ups_tmp_buf[i] = (mask_line[i] << SHADOW_UPSCALE_SHIFT) / sw;
-            }
-        }
-
-        sh_ups_tmp_buf += size;
-    }
-    lv_mem_buf_release(mask_line);
-
-    lv_draw_mask_free_param(&mask_param);
-
-    if(sw == 1) {
-        int32_t i;
-        lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
-        for(i = 0; i < size * size; i++) {
-            res_buf[i] = (sh_buf[i] >> SHADOW_UPSCALE_SHIFT);
-        }
-        return;
-    }
-
-    shadow_blur_corner(size, sw, sh_buf);
-
-#if SHADOW_ENHANCE == 0
-    /*The result is required in lv_opa_t not uint16_t*/
-    uint32_t x;
-    lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
-    for(x = 0; x < size * size; x++) {
-        res_buf[x] = sh_buf[x];
-    }
-#else
-    sw += sw_ori & 1;
-    if(sw > 1) {
-        uint32_t i;
-        uint32_t max_v_div = (LV_OPA_COVER << SHADOW_UPSCALE_SHIFT) / sw;
-        for(i = 0; i < (uint32_t)size * size; i++) {
-            if(sh_buf[i] == 0) continue;
-            else if(sh_buf[i] == LV_OPA_COVER) sh_buf[i] = max_v_div;
-            else  sh_buf[i] = (sh_buf[i] << SHADOW_UPSCALE_SHIFT) / sw;
-        }
-
-        shadow_blur_corner(size, sw, sh_buf);
-    }
-    int32_t x;
-    lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
-    for(x = 0; x < size * size; x++) {
-        res_buf[x] = sh_buf[x];
-    }
-#endif
-
-}
-
-LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, uint16_t * sh_ups_buf)
-{
-    int32_t s_left = sw >> 1;
-    int32_t s_right = (sw >> 1);
-    if((sw & 1) == 0) s_left--;
-
-    /*Horizontal blur*/
-    uint16_t * sh_ups_blur_buf = lv_mem_buf_get(size * sizeof(uint16_t));
-
-    int32_t x;
-    int32_t y;
-
-    uint16_t * sh_ups_tmp_buf = sh_ups_buf;
-
-    for(y = 0; y < size; y++) {
-        int32_t v = sh_ups_tmp_buf[size - 1] * sw;
-        for(x = size - 1; x >= 0; x--) {
-            sh_ups_blur_buf[x] = v;
-
-            /*Forget the right pixel*/
-            uint32_t right_val = 0;
-            if(x + s_right < size) right_val = sh_ups_tmp_buf[x + s_right];
-            v -= right_val;
-
-            /*Add the left pixel*/
-            uint32_t left_val;
-            if(x - s_left - 1 < 0) left_val = sh_ups_tmp_buf[0];
-            else left_val = sh_ups_tmp_buf[x - s_left - 1];
-            v += left_val;
-        }
-        lv_memcpy(sh_ups_tmp_buf, sh_ups_blur_buf, size * sizeof(uint16_t));
-        sh_ups_tmp_buf += size;
-    }
-
-    /*Vertical blur*/
-    uint32_t i;
-    uint32_t max_v = LV_OPA_COVER << SHADOW_UPSCALE_SHIFT;
-    uint32_t max_v_div = max_v / sw;
-    for(i = 0; i < (uint32_t)size * size; i++) {
-        if(sh_ups_buf[i] == 0) continue;
-        else if(sh_ups_buf[i] == max_v) sh_ups_buf[i] = max_v_div;
-        else sh_ups_buf[i] = sh_ups_buf[i] / sw;
-    }
-
-    for(x = 0; x < size; x++) {
-        sh_ups_tmp_buf = &sh_ups_buf[x];
-        int32_t v = sh_ups_tmp_buf[0] * sw;
-        for(y = 0; y < size ; y++, sh_ups_tmp_buf += size) {
-            sh_ups_blur_buf[y] = v < 0 ? 0 : (v >> SHADOW_UPSCALE_SHIFT);
-
-            /*Forget the top pixel*/
-            uint32_t top_val;
-            if(y - s_right <= 0) top_val = sh_ups_tmp_buf[0];
-            else top_val = sh_ups_buf[(y - s_right) * size + x];
-            v -= top_val;
-
-            /*Add the bottom pixel*/
-            uint32_t bottom_val;
-            if(y + s_left + 1 < size) bottom_val = sh_ups_buf[(y + s_left + 1) * size + x];
-            else bottom_val = sh_ups_buf[(size - 1) * size + x];
-            v += bottom_val;
-        }
-
-        /*Write back the result into `sh_ups_buf`*/
-        sh_ups_tmp_buf = &sh_ups_buf[x];
-        for(y = 0; y < size; y++, sh_ups_tmp_buf += size) {
-            (*sh_ups_tmp_buf) = sh_ups_blur_buf[y];
-        }
-    }
-
-    lv_mem_buf_release(sh_ups_blur_buf);
-}
-
-#endif
-
-static void draw_outline(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
-{
-    if(dsc->outline_opa <= LV_OPA_MIN) return;
-    if(dsc->outline_width == 0) return;
-
-    lv_opa_t opa = dsc->outline_opa;
-
-    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
-
-    /*Get the inner radius*/
-    lv_area_t area_inner;
-    lv_area_copy(&area_inner, coords);
-
-    /*Extend the outline into the background area if it's overlapping the edge*/
-    lv_coord_t pad = (dsc->outline_pad == 0 ? (dsc->outline_pad - 1) : dsc->outline_pad);
-    area_inner.x1 -= pad;
-    area_inner.y1 -= pad;
-    area_inner.x2 += pad;
-    area_inner.y2 += pad;
-
-    lv_area_t area_outer;
-    lv_area_copy(&area_outer, &area_inner);
-
-    area_outer.x1 -= dsc->outline_width;
-    area_outer.x2 += dsc->outline_width;
-    area_outer.y1 -= dsc->outline_width;
-    area_outer.y2 += dsc->outline_width;
-
-
-    int32_t inner_w = lv_area_get_width(&area_inner);
-    int32_t inner_h = lv_area_get_height(&area_inner);
-    int32_t rin = dsc->radius;
-    int32_t short_side = LV_MIN(inner_w, inner_h);
-    if(rin > short_side >> 1) rin = short_side >> 1;
-
-    lv_coord_t rout = rin + dsc->outline_width;
-
-    draw_border_generic(clip, &area_outer, &area_inner, rout, rin, dsc->outline_color, dsc->outline_opa, dsc->blend_mode);
-}
-
-void draw_border_generic(const lv_area_t * clip_area, const lv_area_t * outer_area, const lv_area_t * inner_area,
-                         lv_coord_t rout, lv_coord_t rin, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
-{
-    opa = opa >= LV_OPA_COVER ? LV_OPA_COVER : opa;
-
-    bool mask_any = lv_draw_mask_is_any(outer_area);
-
-    if(!mask_any && rout == 0 && rin == 0) {
-        draw_border_simple(clip_area, outer_area, inner_area, color, opa);
-        return;
-    }
-
-#if LV_DRAW_COMPLEX
-    /*Get clipped draw area which is the real draw area.
-     *It is always the same or inside `coords`*/
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, outer_area, clip_area)) return;
-    int32_t draw_area_w = lv_area_get_width(&draw_area);
-
-    /*Create a mask if there is a radius*/
-    lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
-
-    /*Create mask for the outer area*/
-    int16_t mask_rout_id = LV_MASK_ID_INV;
-    lv_draw_mask_radius_param_t mask_rout_param;
-    if(rout > 0) {
-        lv_draw_mask_radius_init(&mask_rout_param, outer_area, rout, false);
-        mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
-    }
-
-    /*Create mask for the inner mask*/
-    lv_draw_mask_radius_param_t mask_rin_param;
-    lv_draw_mask_radius_init(&mask_rin_param, inner_area, rin, true);
-    int16_t mask_rin_id = lv_draw_mask_add(&mask_rin_param, NULL);
-
-    int32_t h;
-    lv_draw_mask_res_t mask_res;
-    lv_area_t blend_area;
-
-    /*Calculate the x and y coordinates where the straight parts area*/
-    lv_area_t core_area;
-    core_area.x1 = LV_MAX(outer_area->x1 + rout, inner_area->x1);
-    core_area.x2 = LV_MIN(outer_area->x2 - rout, inner_area->x2);
-    core_area.y1 = LV_MAX(outer_area->y1 + rout, inner_area->y1);
-    core_area.y2 = LV_MIN(outer_area->y2 - rout, inner_area->y2);
-    lv_coord_t core_w = lv_area_get_width(&core_area);
-
-    bool top_side = outer_area->y1 <= inner_area->y1 ? true : false;
-    bool bottom_side = outer_area->y2 >= inner_area->y2 ? true : false;
-
-    /*If there is other masks, need to draw line by line*/
-    if(mask_any) {
-        blend_area.x1 = draw_area.x1;
-        blend_area.x2 = draw_area.x2;
-        for(h = draw_area.y1; h <= draw_area.y2; h++) {
-            if(!top_side && h < core_area.y1) continue;
-            if(!bottom_side && h > core_area.y2) break;
-
-            blend_area.y1 = h;
-            blend_area.y2 = h;
-
-            lv_memset_ff(mask_buf, draw_area_w);
-            mask_res = lv_draw_mask_apply(mask_buf, draw_area.x1, h, draw_area_w);
-            _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-        }
-
-        lv_draw_mask_free_param(&mask_rin_param);
-        lv_draw_mask_remove_id(mask_rin_id);
-        lv_draw_mask_free_param(&mask_rout_param);
-        lv_draw_mask_remove_id(mask_rout_id);
-        lv_mem_buf_release(mask_buf);
-        return;
-    }
-
-    /*No masks*/
-    bool left_side = outer_area->x1 <= inner_area->x1 ? true : false;
-    bool right_side = outer_area->x2 >= inner_area->x2 ? true : false;
-
-    bool split_hor = true;
-    if(left_side && right_side && top_side && bottom_side &&
-       core_w < SPLIT_LIMIT) {
-        split_hor = false;
-    }
-
-    /*Draw the straight lines first if they are long enough*/
-    if(top_side && split_hor) {
-        blend_area.x1 = core_area.x1;
-        blend_area.x2 = core_area.x2;
-        blend_area.y1 = outer_area->y1;
-        blend_area.y2 = inner_area->y1 - 1;
-        _lv_blend_fill(clip_area, &blend_area, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, blend_mode);
-    }
-
-    if(bottom_side && split_hor) {
-        blend_area.x1 = core_area.x1;
-        blend_area.x2 = core_area.x2;
-        blend_area.y1 = inner_area->y2 + 1;
-        blend_area.y2 = outer_area->y2;
-        _lv_blend_fill(clip_area, &blend_area, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, blend_mode);
-    }
-
-    if(left_side) {
-        blend_area.x1 = outer_area->x1;
-        blend_area.x2 = inner_area->x1 - 1;
-        blend_area.y1 = core_area.y1;
-        blend_area.y2 = core_area.y2;
-        _lv_blend_fill(clip_area, &blend_area, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, blend_mode);
-    }
-
-    if(right_side) {
-        blend_area.x1 = inner_area->x2 + 1;
-        blend_area.x2 = outer_area->x2;
-        blend_area.y1 = core_area.y1;
-        blend_area.y2 = core_area.y2;
-        _lv_blend_fill(clip_area, &blend_area, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, blend_mode);
-    }
-
-    /*Draw the corners*/
-    lv_coord_t blend_w;
-
-    /*Left and right corner together is they close to eachother*/
-    if(!split_hor) {
-        /*Calculate the top corner and mirror it to the bottom*/
-        blend_area.x1 = draw_area.x1;
-        blend_area.x2 = draw_area.x2;
-        lv_coord_t max_h = LV_MAX(rout, outer_area->y1 - inner_area->y1);
-        for(h = 0; h < max_h; h++) {
-            lv_coord_t top_y = outer_area->y1 + h;
-            lv_coord_t bottom_y = outer_area->y2 - h;
-            if(top_y < draw_area.y1 && bottom_y > draw_area.y2) continue;   /*This line is clipped now*/
-
-            lv_memset_ff(mask_buf, draw_area_w);
-            mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, top_y, draw_area_w);
-
-            if(top_y >= draw_area.y1) {
-                blend_area.y1 = top_y;
-                blend_area.y2 = top_y;
-                _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-            }
-
-            if(bottom_y <= draw_area.y2) {
-                blend_area.y1 = bottom_y;
-                blend_area.y2 = bottom_y;
-                _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-            }
-        }
-    }
-    else {
-        /*Left corners*/
-        blend_area.x1 = draw_area.x1;
-        blend_area.x2 = LV_MIN(draw_area.x2, core_area.x1 - 1);
-        blend_w = lv_area_get_width(&blend_area);
-        if(blend_w > 0) {
-            if(left_side || top_side) {
-                for(h = draw_area.y1; h < core_area.y1; h++) {
-                    blend_area.y1 = h;
-                    blend_area.y2 = h;
-
-                    lv_memset_ff(mask_buf, blend_w);
-                    mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, h, blend_w);
-                    _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-                }
-            }
-
-            if(left_side || bottom_side) {
-                for(h = core_area.y2 + 1; h <= draw_area.y2; h++) {
-                    blend_area.y1 = h;
-                    blend_area.y2 = h;
-
-                    lv_memset_ff(mask_buf, blend_w);
-                    mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, h, blend_w);
-                    _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-                }
-            }
-        }
-
-        /*Right corners*/
-        blend_area.x1 = LV_MAX(draw_area.x1, core_area.x2 + 1);
-        blend_area.x2 = draw_area.x2;
-        blend_w = lv_area_get_width(&blend_area);
-
-        if(blend_w > 0) {
-            if(right_side || top_side) {
-                for(h = draw_area.y1; h < core_area.y1; h++) {
-                    blend_area.y1 = h;
-                    blend_area.y2 = h;
-
-                    lv_memset_ff(mask_buf, blend_w);
-                    mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, h, blend_w);
-                    _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-                }
-            }
-
-            if(right_side || bottom_side) {
-                for(h = core_area.y2 + 1; h <= draw_area.y2; h++) {
-                    blend_area.y1 = h;
-                    blend_area.y2 = h;
-
-                    lv_memset_ff(mask_buf, blend_w);
-                    mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, h, blend_w);
-                    _lv_blend_fill(clip_area, &blend_area, color, mask_buf, mask_res, opa, blend_mode);
-                }
-            }
-        }
-    }
-
-    lv_draw_mask_free_param(&mask_rin_param);
-    lv_draw_mask_remove_id(mask_rin_id);
-    lv_draw_mask_free_param(&mask_rout_param);
-    lv_draw_mask_remove_id(mask_rout_id);
-    lv_mem_buf_release(mask_buf);
-
-#else /*LV_DRAW_COMPLEX*/
-    LV_UNUSED(blend_mode);
-#endif /*LV_DRAW_COMPLEX*/
-}
-
-static void draw_border_simple(const lv_area_t * clip, const lv_area_t * outer_area, const lv_area_t * inner_area,
-                               lv_color_t color, lv_opa_t opa)
-{
-    bool top_side = outer_area->y1 <= inner_area->y1 ? true : false;
-    bool bottom_side = outer_area->y2 >= inner_area->y2 ? true : false;
-    bool left_side = outer_area->x1 <= inner_area->x1 ? true : false;
-    bool right_side = outer_area->x2 >= inner_area->x2 ? true : false;
-
-    lv_area_t a;
-    /*Top*/
-    a.x1 = outer_area->x1;
-    a.x2 = outer_area->x2;
-    a.y1 = outer_area->y1;
-    a.y2 = inner_area->y1 - 1;
-    if(top_side) {
-        _lv_blend_fill(clip, &a, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, LV_BLEND_MODE_NORMAL);
-    }
-
-    /*Bottom*/
-    a.y1 = inner_area->y2 + 1;
-    a.y2 = outer_area->y2;
-    if(bottom_side) {
-        _lv_blend_fill(clip, &a, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, LV_BLEND_MODE_NORMAL);
-    }
-
-    /*Left*/
-    a.x1 = outer_area->x1;
-    a.x2 = inner_area->x1 - 1;
-    a.y1 = (top_side) ? inner_area->y1 : outer_area->y1;
-    a.y2 = (bottom_side) ? inner_area->y2 : outer_area->y2;
-    if(left_side) {
-        _lv_blend_fill(clip, &a, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, LV_BLEND_MODE_NORMAL);
-    }
-
-    /*Right*/
-    a.x1 = inner_area->x2 + 1;
-    a.x2 = outer_area->x2;
-    if(right_side) {
-        _lv_blend_fill(clip, &a, color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, LV_BLEND_MODE_NORMAL);
-    }
-
-}
-
-#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.h
index f43a0eafb..efa630cf2 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.h
@@ -13,16 +13,18 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw_blend.h"
-#include "../font/lv_font.h"
+#include "../lv_conf_internal.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_style.h"
+#include "sw/lv_draw_sw_gradient.h"
 
 /*********************
  *      DEFINES
  *********************/
-#define LV_RADIUS_CIRCLE 0x7FFF /**< A very big radius to always draw as circle*/
+#define LV_RADIUS_CIRCLE        0x7FFF /**< A very big radius to always draw as circle*/
 LV_EXPORT_CONST_INT(LV_RADIUS_CIRCLE);
 
-
 /**********************
  *      TYPEDEFS
  **********************/
@@ -32,12 +34,15 @@ typedef struct {
     lv_blend_mode_t blend_mode;
 
     /*Background*/
-    lv_color_t bg_color;
-    lv_color_t bg_grad_color;
-    uint8_t bg_main_color_stop;
-    uint8_t bg_grad_color_stop;
     lv_opa_t bg_opa;
-    lv_grad_dir_t bg_grad_dir : 3;
+#if __STDC_VERSION__ >= 201112L
+    union {
+#endif
+        lv_color_t bg_color;        /**< First element of a gradient is a color, so it maps well here*/
+        lv_grad_dsc_t bg_grad;
+#if __STDC_VERSION__ >= 201112L
+    };
+#endif
 
     /*Background img*/
     const void * bg_img_src;
@@ -69,13 +74,14 @@ typedef struct {
     lv_opa_t shadow_opa;
 } lv_draw_rect_dsc_t;
 
+struct _lv_draw_ctx_t;
+
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
 LV_ATTRIBUTE_FAST_MEM void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc);
 
-//! @endcond
 
 /**
  * Draw a rectangle
@@ -83,15 +89,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc);
  * @param clip the rectangle will be drawn only in this area
  * @param dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
  */
-void lv_draw_rect(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc);
-
-/**
- * Draw a pixel
- * @param point the coordinates of the point to draw
- * @param mask the pixel will be drawn only in this mask
- * @param style pointer to a style
- */
-//void lv_draw_px(const lv_point_t * point, const lv_area_t * clip_area, const lv_style_t * style);
+void lv_draw_rect(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
 
 /**********************
  *      MACROS
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.c
index 447e1e10c..42b4d7799 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.c
@@ -6,6 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw.h"
 #include "lv_draw_triangle.h"
 #include "../misc/lv_math.h"
 #include "../misc/lv_mem.h"
@@ -34,181 +35,16 @@
  *   GLOBAL FUNCTIONS
  **********************/
 
-/**
- * Draw a triangle
- * @param points pointer to an array with 3 points
- * @param clip_area the triangle will be drawn only in this area
- * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
- */
-void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip_area, const lv_draw_rect_dsc_t * draw_dsc)
+void lv_draw_polygon(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t points[],
+                     uint16_t point_cnt)
 {
-#if LV_DRAW_COMPLEX
-    lv_draw_polygon(points, 3, clip_area, draw_dsc);
-#else
-    LV_UNUSED(points);
-    LV_UNUSED(clip_area);
-    LV_UNUSED(draw_dsc);
-    LV_LOG_WARN("Can't draw triangle with LV_DRAW_COMPLEX == 0");
-#endif /*LV_DRAW_COMPLEX*/
+    draw_ctx->draw_polygon(draw_ctx, draw_dsc, points, point_cnt);
 }
 
-/**
- * Draw a polygon. Only convex polygons are supported
- * @param points an array of points
- * @param point_cnt number of points
- * @param clip_area polygon will be drawn only in this area
- * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
- */
-void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * clip_area,
-                     const lv_draw_rect_dsc_t * draw_dsc)
+void lv_draw_triangle(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t points[])
 {
-#if LV_DRAW_COMPLEX
-    if(point_cnt < 3) return;
-    if(points == NULL) return;
 
-    /*Join adjacent points if they are on the same coordinate*/
-    lv_point_t * p = lv_mem_buf_get(point_cnt * sizeof(lv_point_t));
-    if(p == NULL) return;
-    uint16_t i;
-    uint16_t pcnt = 0;
-    p[0] = points[0];
-    for(i = 0; i < point_cnt - 1; i++) {
-        if(points[i].x != points[i + 1].x || points[i].y != points[i + 1].y) {
-            p[pcnt] = points[i];
-            pcnt++;
-        }
-    }
-    /*The first and the last points are also adjacent*/
-    if(points[0].x != points[point_cnt - 1].x || points[0].y != points[point_cnt - 1].y) {
-        p[pcnt] = points[point_cnt - 1];
-        pcnt++;
-    }
-
-    point_cnt = pcnt;
-    if(point_cnt < 3) {
-        lv_mem_buf_release(p);
-        return;
-    }
-
-    lv_area_t poly_coords = {.x1 = LV_COORD_MAX, .y1 = LV_COORD_MAX, .x2 = LV_COORD_MIN, .y2 = LV_COORD_MIN};
-
-    for(i = 0; i < point_cnt; i++) {
-        poly_coords.x1 = LV_MIN(poly_coords.x1, p[i].x);
-        poly_coords.y1 = LV_MIN(poly_coords.y1, p[i].y);
-        poly_coords.x2 = LV_MAX(poly_coords.x2, p[i].x);
-        poly_coords.y2 = LV_MAX(poly_coords.y2, p[i].y);
-    }
-
-    bool is_common;
-    lv_area_t poly_mask;
-    is_common = _lv_area_intersect(&poly_mask, &poly_coords, clip_area);
-    if(!is_common) {
-        lv_mem_buf_release(p);
-        return;
-    }
-    /*Find the lowest point*/
-    lv_coord_t y_min = p[0].y;
-    int16_t y_min_i = 0;
-
-    for(i = 1; i < point_cnt; i++) {
-        if(p[i].y < y_min) {
-            y_min = p[i].y;
-            y_min_i = i;
-        }
-    }
-
-    lv_draw_mask_line_param_t * mp = lv_mem_buf_get(sizeof(lv_draw_mask_line_param_t) * point_cnt);
-    lv_draw_mask_line_param_t * mp_next = mp;
-
-    int32_t i_prev_left = y_min_i;
-    int32_t i_prev_right = y_min_i;
-    int32_t i_next_left;
-    int32_t i_next_right;
-    uint32_t mask_cnt = 0;
-
-    /*Get the index of the left and right points*/
-    i_next_left = y_min_i - 1;
-    if(i_next_left < 0) i_next_left = point_cnt + i_next_left;
-
-    i_next_right = y_min_i + 1;
-    if(i_next_right > point_cnt - 1) i_next_right = 0;
-
-    /**
-     * Check if the order of points is inverted or not.
-     * The normal case is when the left point is on `y_min_i - 1`
-     * Explanation:
-     *   if angle(p_left) < angle(p_right) -> inverted
-     *   dy_left/dx_left < dy_right/dx_right
-     *   dy_left * dx_right < dy_right * dx_left
-     */
-    lv_coord_t dxl = p[i_next_left].x - p[y_min_i].x;
-    lv_coord_t dxr = p[i_next_right].x - p[y_min_i].x;
-    lv_coord_t dyl = p[i_next_left].y - p[y_min_i].y;
-    lv_coord_t dyr = p[i_next_right].y - p[y_min_i].y;
-
-    bool inv = false;
-    if(dyl * dxr < dyr * dxl) inv = true;
-
-    do {
-        if(!inv) {
-            i_next_left = i_prev_left - 1;
-            if(i_next_left < 0) i_next_left = point_cnt + i_next_left;
-
-            i_next_right = i_prev_right + 1;
-            if(i_next_right > point_cnt - 1) i_next_right = 0;
-        }
-        else {
-            i_next_left = i_prev_left + 1;
-            if(i_next_left > point_cnt - 1) i_next_left = 0;
-
-            i_next_right = i_prev_right - 1;
-            if(i_next_right < 0) i_next_right = point_cnt + i_next_right;
-        }
-
-        if(p[i_next_left].y >=  p[i_prev_left].y) {
-            if(p[i_next_left].y != p[i_prev_left].y &&
-               p[i_next_left].x !=  p[i_prev_left].x) {
-                lv_draw_mask_line_points_init(mp_next, p[i_prev_left].x, p[i_prev_left].y,
-                                              p[i_next_left].x, p[i_next_left].y,
-                                              LV_DRAW_MASK_LINE_SIDE_RIGHT);
-                lv_draw_mask_add(mp_next, mp);
-                mp_next++;
-            }
-            mask_cnt++;
-            i_prev_left = i_next_left;
-        }
-
-        if(mask_cnt == point_cnt) break;
-
-        if(p[i_next_right].y >=  p[i_prev_right].y) {
-            if(p[i_next_right].y != p[i_prev_right].y &&
-               p[i_next_right].x !=  p[i_prev_right].x) {
-
-                lv_draw_mask_line_points_init(mp_next, p[i_prev_right].x, p[i_prev_right].y,
-                                              p[i_next_right].x, p[i_next_right].y,
-                                              LV_DRAW_MASK_LINE_SIDE_LEFT);
-                lv_draw_mask_add(mp_next, mp);
-                mp_next++;
-            }
-            mask_cnt++;
-            i_prev_right = i_next_right;
-        }
-
-    } while(mask_cnt < point_cnt);
-
-    lv_draw_rect(&poly_coords, clip_area, draw_dsc);
-
-    lv_draw_mask_remove_custom(mp);
-
-    lv_mem_buf_release(mp);
-    lv_mem_buf_release(p);
-#else
-    LV_UNUSED(points);
-    LV_UNUSED(point_cnt);
-    LV_UNUSED(clip_area);
-    LV_UNUSED(draw_dsc);
-    LV_LOG_WARN("Can't draw polygon with LV_DRAW_COMPLEX == 0");
-#endif /*LV_DRAW_COMPLEX*/
+    draw_ctx->draw_polygon(draw_ctx, draw_dsc, points, 3);
 }
 
 /**********************
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.h
index 5a16585a1..e8d857502 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.h
@@ -27,24 +27,10 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
-/**
- * Draw a triangle
- * @param points pointer to an array with 3 points
- * @param clip_area the triangle will be drawn only in this area
- * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
- */
-void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip, const lv_draw_rect_dsc_t * draw_dsc);
-
-/**
- * Draw a polygon. Only convex polygons are supported.
- * @param points an array of points
- * @param point_cnt number of points
- * @param clip_area polygon will be drawn only in this area
- * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
- */
-void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * mask,
-                     const lv_draw_rect_dsc_t * draw_dsc);
+void lv_draw_polygon(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t points[],
+                     uint16_t point_cnt);
 
+void lv_draw_triangle(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t points[]);
 /**********************
  *      MACROS
  **********************/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.c
index 07ea03c52..a6d0efc36 100644
--- a/lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.c
@@ -667,7 +667,7 @@ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc)
         xr = xs_fract + 0x80;
     }
     else if(xs_fract > 0x90) {
-        xn =  1;
+        xn = 1;
         if(dsc->tmp.xs_int + xn >= dsc->cfg.src_w) xn = 0;
         xr = (0xFF - xs_fract) + 0x80;
     }
@@ -686,7 +686,7 @@ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc)
         yr = ys_fract + 0x80;
     }
     else if(ys_fract > 0x90) {
-        yn =  1;
+        yn = 1;
         if(dsc->tmp.ys_int + yn >= dsc->cfg.src_h) yn = 0;
 
         yr = (0xFF - ys_fract) + 0x80;
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.c b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp.c
similarity index 99%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.c
rename to lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp.c
index 1b669d861..a6fb49b7b 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp.c
@@ -31,12 +31,10 @@
  *      INCLUDES
  *********************/
 
-#include "../lv_conf_internal.h"
+#include "lv_gpu_nxp_pxp.h"
 
 #if LV_USE_GPU_NXP_PXP
 
-#include "lvgl.h"
-#include "lv_gpu_nxp_pxp.h"
 #include "../misc/lv_mem.h"
 #include "../misc/lv_log.h"
 
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.h b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp.h
similarity index 98%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.h
rename to lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp.h
index 9aba7c27d..8d812882c 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp.h
@@ -38,6 +38,10 @@ extern "C" {
  *      INCLUDES
  *********************/
 
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_NXP_PXP
+
 #include "../misc/lv_area.h"
 #include "../misc/lv_color.h"
 
@@ -180,6 +184,8 @@ void lv_gpu_nxp_pxp_disable_recolor(void);
  *   STATIC FUNCTIONS
  **********************/
 
+#endif /*LV_USE_GPU_NXP_PXP*/
+
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.c b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp_osa.c
similarity index 99%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.c
rename to lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp_osa.c
index d247f2b74..1203434c7 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp_osa.c
@@ -31,10 +31,10 @@
  *      INCLUDES
  *********************/
 
-#include "../lv_conf_internal.h"
+#include "lv_gpu_nxp_pxp_osa.h"
+#if LV_USE_GPU_NXP_PXP && LV_USE_GPU_NXP_PXP_AUTO_INIT
 #include "../misc/lv_log.h"
 
-#if LV_USE_GPU_NXP_PXP && LV_USE_GPU_NXP_PXP_AUTO_INIT
 
 #include "lv_gpu_nxp_pxp.h"
 #include "fsl_pxp.h"
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.h b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp_osa.h
similarity index 97%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.h
rename to lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp_osa.h
index ab30b8d06..89524dae5 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/nxp_pxp/lv_gpu_nxp_pxp_osa.h
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_GPU_NXP_PXP && LV_USE_GPU_NXP_PXP_AUTO_INIT
 extern lv_nxp_pxp_cfg_t pxp_default_cfg;
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.c b/lib/libesp32_lvgl/lvgl/src/draw/nxp_vglite/lv_gpu_nxp_vglite.c
similarity index 99%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.c
rename to lib/libesp32_lvgl/lvgl/src/draw/nxp_vglite/lv_gpu_nxp_vglite.c
index 8e6ee193d..43dd88179 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/nxp_vglite/lv_gpu_nxp_vglite.c
@@ -31,12 +31,11 @@
  *      INCLUDES
  *********************/
 
-#include "../lv_conf_internal.h"
+#include "lv_gpu_nxp_vglite.h"
 
 #if LV_USE_GPU_NXP_VG_LITE
 
 #include "lvgl.h"
-#include "lv_gpu_nxp_vglite.h"
 #include "../misc/lv_log.h"
 #include "fsl_cache.h"
 #include "vg_lite.h"
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.h b/lib/libesp32_lvgl/lvgl/src/draw/nxp_vglite/lv_gpu_nxp_vglite.h
similarity index 98%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.h
rename to lib/libesp32_lvgl/lvgl/src/draw/nxp_vglite/lv_gpu_nxp_vglite.h
index 31416598e..26f4c3fe4 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/nxp_vglite/lv_gpu_nxp_vglite.h
@@ -37,7 +37,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc/lv_area.h"
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_NXP_VG_LITE
 
 /*********************
  *      DEFINES
@@ -134,6 +136,8 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv
  */
 lv_res_t lv_gpu_nxp_vglite_blit(lv_gpu_nxp_vglite_blit_info_t * blit);
 
+#endif /*LV_USE_GPU_NXP_VG_LITE*/
+
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/README.md b/lib/libesp32_lvgl/lvgl/src/draw/sdl/README.md
similarity index 93%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/README.md
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/README.md
index 289fc04e4..4415ffac8 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/README.md
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/README.md
@@ -18,11 +18,11 @@ such as OpenGL.
 
 ## Notices for files
 
-### `lv_gpu_sdl_stack_blur.c`
+### `lv_draw_sdl_stack_blur.c`
 
 Contains modified code from [android-stackblur](https://github.com/kikoso/android-stackblur) project.
 Apache License 2.0
 
-### `lv_gpu_sdl_lru.c`/`lv_gpu_sdl_lru.h`
+### `lv_draw_sdl_lru.c`/`lv_draw_sdl_lru.h`
 
 Contains modified code from [C-LRU-Cache](https://github.com/willcannings/C-LRU-Cache) project. No license defined.
\ No newline at end of file
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.c
new file mode 100644
index 000000000..430f3a23c
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.c
@@ -0,0 +1,98 @@
+/**
+ * @file lv_draw_sdl.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "lv_draw_sdl.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+void lv_draw_sdl_draw_rect(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+
+lv_res_t lv_draw_sdl_img_core(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                              const lv_area_t * coords, const void * src);
+
+void lv_draw_sdl_draw_letter(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,  const lv_point_t * pos_p,
+                             uint32_t letter);
+
+void lv_draw_sdl_draw_line(lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc, const lv_point_t * point1,
+                           const lv_point_t * point2);
+
+void lv_draw_sdl_draw_arc(lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center,
+                          uint16_t radius, uint16_t start_angle, uint16_t end_angle);
+
+void lv_draw_sdl_polygon(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t * points,
+                         uint16_t point_cnt);
+
+void lv_draw_sdl_draw_bg(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sdl_init_ctx(lv_disp_drv_t * disp_drv, lv_draw_ctx_t * draw_ctx)
+{
+    _lv_draw_sdl_utils_init();
+    lv_memset_00(draw_ctx, sizeof(lv_draw_sdl_ctx_t));
+    draw_ctx->draw_rect = lv_draw_sdl_draw_rect;
+    draw_ctx->draw_img = lv_draw_sdl_img_core;
+    draw_ctx->draw_letter = lv_draw_sdl_draw_letter;
+    draw_ctx->draw_line = lv_draw_sdl_draw_line;
+    draw_ctx->draw_arc = lv_draw_sdl_draw_arc;
+    draw_ctx->draw_polygon = lv_draw_sdl_polygon;
+    draw_ctx->draw_bg = lv_draw_sdl_draw_bg;
+    lv_draw_sdl_ctx_t * draw_ctx_sdl = (lv_draw_sdl_ctx_t *) draw_ctx;
+    draw_ctx_sdl->renderer = ((lv_draw_sdl_drv_param_t *) disp_drv->user_data)->renderer;
+    draw_ctx_sdl->internals = lv_mem_alloc(sizeof(lv_draw_sdl_context_internals_t));
+    lv_memset_00(draw_ctx_sdl->internals, sizeof(lv_draw_sdl_context_internals_t));
+    lv_draw_sdl_texture_cache_init(draw_ctx_sdl);
+}
+
+void lv_draw_sdl_deinit_ctx(lv_disp_drv_t * disp_drv, lv_draw_ctx_t * draw_ctx)
+{
+    lv_draw_sdl_ctx_t * draw_ctx_sdl = (lv_draw_sdl_ctx_t *) draw_ctx;
+    lv_draw_sdl_texture_cache_deinit(draw_ctx_sdl);
+    lv_mem_free(draw_ctx_sdl->internals);
+    _lv_draw_sdl_utils_deinit();
+}
+
+SDL_Texture * lv_draw_sdl_create_screen_texture(SDL_Renderer * renderer, lv_coord_t hor, lv_coord_t ver)
+{
+    SDL_Texture * texture = SDL_CreateTexture(renderer, LV_DRAW_SDL_TEXTURE_FORMAT, SDL_TEXTUREACCESS_TARGET, hor, ver);
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    return texture;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.h
new file mode 100644
index 000000000..9b44a7b2f
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.h
@@ -0,0 +1,96 @@
+/**
+ * @file lv_draw_sdl.h
+ *
+ */
+
+#ifndef LV_DRAW_SDL_H
+#define LV_DRAW_SDL_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include LV_GPU_SDL_INCLUDE_PATH
+
+#include "../lv_draw.h"
+#include "../../core/lv_disp.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+#define LV_DRAW_SDL_TEXTURE_FORMAT SDL_PIXELFORMAT_ARGB8888
+#else
+#define LV_DRAW_SDL_TEXTURE_FORMAT SDL_PIXELFORMAT_RGBA8888
+#endif
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+struct lv_draw_sdl_context_internals_t;
+
+typedef struct {
+    /**
+     * Render for display driver
+     */
+    SDL_Renderer * renderer;
+    void * user_data;
+} lv_draw_sdl_drv_param_t;
+
+typedef struct {
+    lv_draw_ctx_t base_draw;
+    SDL_Renderer * renderer;
+    struct lv_draw_sdl_context_internals_t * internals;
+} lv_draw_sdl_ctx_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+void lv_draw_sdl_init_ctx(lv_disp_drv_t * disp_drv, lv_draw_ctx_t * draw_ctx);
+
+/**
+ * @brief Free caches
+ *
+ */
+void lv_draw_sdl_deinit_ctx(lv_disp_drv_t * disp_drv, lv_draw_ctx_t * draw_ctx);
+
+SDL_Texture * lv_draw_sdl_create_screen_texture(SDL_Renderer * renderer, lv_coord_t hor, lv_coord_t ver);
+
+/*======================
+ * Add/remove functions
+ *=====================*/
+
+/*=====================
+ * Setter functions
+ *====================*/
+
+/*=====================
+ * Getter functions
+ *====================*/
+
+/*=====================
+ * Other functions
+ *====================*/
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*LV_USE_GPU_SDL*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SDL_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.mk b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.mk
new file mode 100644
index 000000000..6609c38bc
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl.mk
@@ -0,0 +1,18 @@
+CSRCS += lv_draw_sdl.c
+CSRCS += lv_draw_sdl_arc.c
+CSRCS += lv_draw_sdl_bg.c
+CSRCS += lv_draw_sdl_composite.c
+CSRCS += lv_draw_sdl_img.c
+CSRCS += lv_draw_sdl_label.c
+CSRCS += lv_draw_sdl_line.c
+CSRCS += lv_draw_sdl_mask.c
+CSRCS += lv_draw_sdl_polygon.c
+CSRCS += lv_draw_sdl_rect.c
+CSRCS += lv_draw_sdl_stack_blur.c
+CSRCS += lv_draw_sdl_texture_cache.c
+CSRCS += lv_draw_sdl_utils.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl
+
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl"
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_arc.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_arc.c
new file mode 100644
index 000000000..5786eaeb9
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_arc.c
@@ -0,0 +1,238 @@
+/**
+ * @file lv_draw_sdl_arc.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "lv_draw_sdl.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+static void dump_masks(SDL_Texture * texture, const lv_area_t * coords, const int16_t * ids, int16_t ids_count,
+                       const int16_t * caps);
+
+static void get_cap_area(int16_t angle, lv_coord_t thickness, uint16_t radius, const lv_point_t * center,
+                         lv_area_t * out);
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+void lv_draw_sdl_draw_arc(lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center,
+                          uint16_t radius, uint16_t start_angle, uint16_t end_angle)
+{
+    lv_draw_sdl_ctx_t * ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+
+    lv_area_t area_out;
+    area_out.x1 = center->x - radius;
+    area_out.y1 = center->y - radius;
+    area_out.x2 = center->x + radius - 1;  /*-1 because the center already belongs to the left/bottom part*/
+    area_out.y2 = center->y + radius - 1;
+
+    lv_area_t draw_area;
+    if(!_lv_area_intersect(&draw_area, &area_out, draw_ctx->clip_area)) {
+        return;
+    }
+
+    lv_area_t area_in;
+    lv_area_copy(&area_in, &area_out);
+    area_in.x1 += dsc->width;
+    area_in.y1 += dsc->width;
+    area_in.x2 -= dsc->width;
+    area_in.y2 -= dsc->width;
+
+
+    while(start_angle >= 360) start_angle -= 360;
+    while(end_angle >= 360) end_angle -= 360;
+
+    int16_t mask_ids[3] = {LV_MASK_ID_INV, LV_MASK_ID_INV, LV_MASK_ID_INV}, mask_ids_count = 1;
+    int16_t cap_ids[2] = {LV_MASK_ID_INV, LV_MASK_ID_INV};
+
+    lv_draw_mask_radius_param_t mask_out_param;
+    lv_draw_mask_radius_init(&mask_out_param, &area_out, LV_RADIUS_CIRCLE, false);
+    mask_ids[0] = lv_draw_mask_add(&mask_out_param, NULL);
+
+    lv_draw_mask_radius_param_t mask_in_param;
+    if(lv_area_get_width(&area_in) > 0 && lv_area_get_height(&area_in) > 0) {
+        lv_draw_mask_radius_init(&mask_in_param, &area_in, LV_RADIUS_CIRCLE, true);
+        mask_ids[1] = lv_draw_mask_add(&mask_in_param, NULL);
+        mask_ids_count++;
+    }
+
+    lv_draw_mask_angle_param_t mask_angle_param;
+    if((start_angle - end_angle) % 360) {
+        lv_draw_mask_angle_init(&mask_angle_param, center->x, center->y, start_angle, end_angle);
+        mask_ids[2] = lv_draw_mask_add(&mask_angle_param, NULL);
+        mask_ids_count++;
+    }
+
+    lv_draw_mask_radius_param_t cap_start_param, cap_end_param;
+    if(mask_ids_count == 3 && dsc->rounded) {
+        lv_area_t start_area, end_area;
+        get_cap_area((int16_t) start_angle, dsc->width, radius, center, &start_area);
+        get_cap_area((int16_t) end_angle, dsc->width, radius, center, &end_area);
+        lv_draw_mask_radius_init(&cap_start_param, &start_area, dsc->width / 2, false);
+        cap_ids[0] = lv_draw_mask_add(&cap_start_param, NULL);
+        lv_draw_mask_radius_init(&cap_end_param, &end_area, dsc->width / 2, false);
+        cap_ids[1] = lv_draw_mask_add(&cap_end_param, NULL);
+    }
+
+    lv_coord_t w = lv_area_get_width(&draw_area), h = lv_area_get_height(&draw_area);
+    SDL_Texture * texture = lv_draw_sdl_composite_texture_obtain(ctx, LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_STREAM1, w, h);
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    dump_masks(texture, &draw_area, mask_ids, mask_ids_count, cap_ids[0] != LV_MASK_ID_INV ? cap_ids : NULL);
+
+    lv_draw_mask_remove_id(mask_ids[0]);
+    lv_draw_mask_free_param(&mask_out_param);
+
+    if(mask_ids_count > 1) {
+        lv_draw_mask_remove_id(mask_ids[1]);
+        lv_draw_mask_free_param(&mask_in_param);
+    }
+
+    if(mask_ids_count > 2) {
+        lv_draw_mask_remove_id(mask_ids[2]);
+        lv_draw_mask_free_param(&mask_angle_param);
+    }
+
+    if(cap_ids[0] != LV_MASK_ID_INV) {
+        lv_draw_mask_remove_id(cap_ids[0]);
+        lv_draw_mask_remove_id(cap_ids[1]);
+        lv_draw_mask_free_param(&cap_start_param);
+        lv_draw_mask_free_param(&cap_end_param);
+    }
+
+    SDL_Rect srcrect = {0, 0, w, h}, dstrect;
+    lv_area_to_sdl_rect(&draw_area, &dstrect);
+    SDL_Color color;
+    lv_color_to_sdl_color(&dsc->color, &color);
+    SDL_SetTextureColorMod(texture, color.r, color.g, color.b);
+    SDL_SetTextureAlphaMod(texture, dsc->opa);
+    SDL_RenderCopy(ctx->renderer, texture, &srcrect, &dstrect);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void dump_masks(SDL_Texture * texture, const lv_area_t * coords, const int16_t * ids, int16_t ids_count,
+                       const int16_t * caps)
+{
+    lv_coord_t w = lv_area_get_width(coords), h = lv_area_get_height(coords);
+    SDL_assert(w > 0 && h > 0);
+    SDL_Rect rect = {0, 0, w, h};
+    uint8_t * pixels;
+    int pitch;
+    if(SDL_LockTexture(texture, &rect, (void **) &pixels, &pitch) != 0) return;
+
+    lv_opa_t * line_buf = lv_mem_buf_get(rect.w);
+    for(lv_coord_t y = 0; y < rect.h; y++) {
+        lv_memset_ff(line_buf, rect.w);
+        lv_coord_t abs_x = (lv_coord_t) coords->x1, abs_y = (lv_coord_t)(y + coords->y1), len = (lv_coord_t) rect.w;
+        lv_draw_mask_res_t res;
+        res = lv_draw_mask_apply_ids(line_buf, abs_x, abs_y, len, ids, ids_count);
+        if(res == LV_DRAW_MASK_RES_TRANSP) {
+            lv_memset_00(&pixels[y * pitch], 4 * rect.w);
+        }
+        else if(res == LV_DRAW_MASK_RES_FULL_COVER) {
+            lv_memset_ff(&pixels[y * pitch], 4 * rect.w);
+        }
+        else {
+            for(int x = 0; x < rect.w; x++) {
+                uint8_t * pixel = &pixels[y * pitch + x * 4];
+                *pixel = line_buf[x];
+                pixel[1] = pixel[2] = pixel[3] = 0xFF;
+            }
+        }
+        if(caps) {
+            for(int i = 0; i < 2; i++) {
+                lv_memset_ff(line_buf, rect.w);
+                res = lv_draw_mask_apply_ids(line_buf, abs_x, abs_y, len, &caps[i], 1);
+                if(res == LV_DRAW_MASK_RES_TRANSP) {
+                    /* Ignore */
+                }
+                else if(res == LV_DRAW_MASK_RES_FULL_COVER) {
+                    lv_memset_ff(&pixels[y * pitch], 4 * rect.w);
+                }
+                else {
+                    for(int x = 0; x < rect.w; x++) {
+                        uint8_t * pixel = &pixels[y * pitch + x * 4];
+                        uint16_t old_opa = line_buf[x] + *pixel;
+                        *pixel = LV_MIN(old_opa, 0xFF);
+                        pixel[1] = pixel[2] = pixel[3] = 0xFF;
+                    }
+                }
+            }
+        }
+    }
+    lv_mem_buf_release(line_buf);
+    SDL_UnlockTexture(texture);
+}
+
+static void get_cap_area(int16_t angle, lv_coord_t thickness, uint16_t radius, const lv_point_t * center,
+                         lv_area_t * out)
+{
+    const uint8_t ps = 8;
+    const uint8_t pa = 127;
+
+    int32_t thick_half = thickness / 2;
+    uint8_t thick_corr = (thickness & 0x01) ? 0 : 1;
+
+    int32_t cir_x;
+    int32_t cir_y;
+
+    cir_x = ((radius - thick_half) * lv_trigo_sin((int16_t)(90 - angle))) >> (LV_TRIGO_SHIFT - ps);
+    cir_y = ((radius - thick_half) * lv_trigo_sin(angle)) >> (LV_TRIGO_SHIFT - ps);
+
+    /*Actually the center of the pixel need to be calculated so apply 1/2 px offset*/
+    if(cir_x > 0) {
+        cir_x = (cir_x - pa) >> ps;
+        out->x1 = cir_x - thick_half + thick_corr;
+        out->x2 = cir_x + thick_half;
+    }
+    else {
+        cir_x = (cir_x + pa) >> ps;
+        out->x1 = cir_x - thick_half;
+        out->x2 = cir_x + thick_half - thick_corr;
+    }
+
+    if(cir_y > 0) {
+        cir_y = (cir_y - pa) >> ps;
+        out->y1 = cir_y - thick_half + thick_corr;
+        out->y2 = cir_y + thick_half;
+    }
+    else {
+        cir_y = (cir_y + pa) >> ps;
+        out->y1 = cir_y - thick_half;
+        out->y2 = cir_y + thick_half - thick_corr;
+    }
+    lv_area_move(out, center->x, center->y);
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_bg.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_bg.c
new file mode 100644
index 000000000..48e0f6b19
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_bg.c
@@ -0,0 +1,106 @@
+/**
+ * @file lv_draw_sdl_bg.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "../lv_draw_rect.h"
+#include "../lv_draw_img.h"
+#include "../lv_draw_label.h"
+#include "../lv_draw_mask.h"
+#include "../../core/lv_refr.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static void draw_bg_color(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                          const lv_draw_rect_dsc_t * dsc);
+
+static void draw_bg_img(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                        const lv_draw_rect_dsc_t * dsc);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sdl_draw_bg(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+    const lv_area_t * clip = draw_ctx->clip_area;
+    lv_draw_sdl_ctx_t * ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+    /* Coords will be translated so coords will start at (0,0) */
+    lv_area_t t_area;
+    bool has_content = _lv_area_intersect(&t_area, coords, clip);
+
+    /* Shadows and outlines will also draw in extended area */
+    if(has_content) {
+        if(dsc->bg_img_src) {
+            draw_bg_img(ctx, coords, &t_area, dsc);
+        }
+        else {
+            draw_bg_color(ctx, coords, &t_area, dsc);
+        }
+    }
+
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void draw_bg_color(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                          const lv_draw_rect_dsc_t * dsc)
+{
+    SDL_Color bg_color;
+    lv_color_to_sdl_color(&dsc->bg_color, &bg_color);
+    SDL_SetRenderDrawBlendMode(ctx->renderer, SDL_BLENDMODE_NONE);
+    SDL_SetRenderDrawColor(ctx->renderer, bg_color.r, bg_color.g, bg_color.b, dsc->bg_opa);
+
+    SDL_Rect rect;
+    lv_area_to_sdl_rect(draw_area, &rect);
+    SDL_RenderFillRect(ctx->renderer, &rect);
+
+    SDL_SetRenderDrawBlendMode(ctx->renderer, SDL_BLENDMODE_BLEND);
+}
+
+static void draw_bg_img(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                        const lv_draw_rect_dsc_t * dsc)
+{
+    SDL_SetRenderDrawBlendMode(ctx->renderer, SDL_BLENDMODE_NONE);
+    SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 0);
+
+    SDL_Rect rect;
+    lv_area_to_sdl_rect(draw_area, &rect);
+    SDL_RenderFillRect(ctx->renderer, &rect);
+
+    SDL_SetRenderDrawBlendMode(ctx->renderer, SDL_BLENDMODE_BLEND);
+    lv_draw_rect((lv_draw_ctx_t *) ctx, dsc, coords);
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_composite.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_composite.c
new file mode 100644
index 000000000..1ee843f7a
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_composite.c
@@ -0,0 +1,256 @@
+/**
+ * @file lv_draw_sdl_composite.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "../../misc/lv_gc.h"
+#include "../../core/lv_refr.h"
+#include "lv_draw_sdl_composite.h"
+#include "lv_draw_sdl_mask.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_priv.h"
+#include "lv_draw_sdl_texture_cache.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    lv_draw_sdl_composite_texture_id_t type;
+} composite_key_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static composite_key_t mask_key_create(lv_draw_sdl_composite_texture_id_t type);
+
+static lv_coord_t next_pow_of_2(lv_coord_t num);
+
+static void dump_masks(SDL_Texture * texture, const lv_area_t * coords);
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+bool lv_draw_sdl_composite_begin(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords_in, const lv_area_t * clip_in,
+                                 const lv_area_t * extension, lv_blend_mode_t blend_mode, lv_area_t * coords_out,
+                                 lv_area_t * clip_out, lv_area_t * apply_area)
+{
+    lv_area_t full_coords = *coords_in;
+
+    /* Normalize full_coords */
+    if(full_coords.x1 > full_coords.x2) {
+        lv_coord_t x2 = full_coords.x2;
+        full_coords.x2 = full_coords.x1;
+        full_coords.x1 = x2;
+    }
+    if(full_coords.y1 > full_coords.y2) {
+        lv_coord_t y2 = full_coords.y2;
+        full_coords.y2 = full_coords.y1;
+        full_coords.y1 = y2;
+    }
+
+    if(extension) {
+        full_coords.x1 -= extension->x1;
+        full_coords.x2 += extension->x2;
+        full_coords.y1 -= extension->y1;
+        full_coords.y2 += extension->y2;
+    }
+
+    if(!_lv_area_intersect(apply_area, &full_coords, clip_in)) return false;
+    bool has_mask = lv_draw_mask_is_any(apply_area);
+
+    const bool draw_mask = has_mask && LV_GPU_SDL_CUSTOM_BLEND_MODE;
+    const bool draw_blend = blend_mode != LV_BLEND_MODE_NORMAL;
+    if(draw_mask || draw_blend) {
+        lv_draw_sdl_context_internals_t * internals = ctx->internals;
+        LV_ASSERT(internals->mask == NULL && internals->composition == NULL);
+
+        lv_coord_t w = lv_area_get_width(apply_area), h = lv_area_get_height(apply_area);
+        internals->composition = lv_draw_sdl_composite_texture_obtain(ctx, LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_TARGET0, w, h);
+        /* Don't need to worry about overflow */
+        lv_coord_t ofs_x = (lv_coord_t) - apply_area->x1, ofs_y = (lv_coord_t) - apply_area->y1;
+        /* Offset draw area to start with (0,0) of coords */
+        lv_area_move(coords_out, ofs_x, ofs_y);
+        lv_area_move(clip_out, ofs_x, ofs_y);
+        SDL_SetRenderTarget(ctx->renderer, internals->composition);
+        SDL_SetRenderDrawColor(ctx->renderer, 255, 255, 255, 0);
+        SDL_RenderClear(ctx->renderer);
+#if LV_GPU_SDL_CUSTOM_BLEND_MODE
+        internals->mask = lv_draw_sdl_composite_texture_obtain(ctx, LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_STREAM0, w, h);
+        dump_masks(internals->mask, apply_area);
+#endif
+    }
+    else if(has_mask) {
+        /* Fallback mask handling. This will at least make bars looks less bad */
+        for(uint8_t i = 0; i < _LV_MASK_MAX_NUM; i++) {
+            _lv_draw_mask_common_dsc_t * comm_param = LV_GC_ROOT(_lv_draw_mask_list[i]).param;
+            if(comm_param == NULL) continue;
+            switch(comm_param->type) {
+                case LV_DRAW_MASK_TYPE_RADIUS: {
+                        const lv_draw_mask_radius_param_t * param = (const lv_draw_mask_radius_param_t *) comm_param;
+                        if(param->cfg.outer) break;
+                        _lv_area_intersect(clip_out, apply_area, &param->cfg.rect);
+                        break;
+                    }
+                default:
+                    break;
+            }
+        }
+    }
+    return has_mask;
+}
+
+void lv_draw_sdl_composite_end(lv_draw_sdl_ctx_t * ctx, const lv_area_t * apply_area, lv_blend_mode_t blend_mode)
+{
+    lv_draw_sdl_context_internals_t * internals = ctx->internals;
+    SDL_Rect src_rect = {0, 0, lv_area_get_width(apply_area), lv_area_get_height(apply_area)};
+#if LV_GPU_SDL_CUSTOM_BLEND_MODE
+    if(internals->mask) {
+        SDL_BlendMode mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ZERO, SDL_BLENDFACTOR_ONE,
+                                                        SDL_BLENDOPERATION_ADD, SDL_BLENDFACTOR_ZERO,
+                                                        SDL_BLENDFACTOR_SRC_ALPHA, SDL_BLENDOPERATION_ADD);
+        SDL_SetTextureBlendMode(internals->mask, mode);
+        SDL_RenderCopy(ctx->renderer, internals->mask, &src_rect, &src_rect);
+    }
+#endif
+
+    /* Shapes are drawn on composite layer when mask or blend mode is present */
+    if(internals->composition) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(apply_area, &dst_rect);
+
+        SDL_SetRenderTarget(ctx->renderer, ctx->base_draw.buf);
+        switch(blend_mode) {
+            case LV_BLEND_MODE_NORMAL:
+                SDL_SetTextureBlendMode(internals->composition, SDL_BLENDMODE_BLEND);
+                break;
+            case LV_BLEND_MODE_ADDITIVE:
+                SDL_SetTextureBlendMode(internals->composition, SDL_BLENDMODE_ADD);
+                break;
+#if LV_GPU_SDL_CUSTOM_BLEND_MODE
+            case LV_BLEND_MODE_SUBTRACTIVE: {
+                    SDL_BlendMode mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ONE,
+                                                                    SDL_BLENDOPERATION_SUBTRACT, SDL_BLENDFACTOR_ONE,
+                                                                    SDL_BLENDFACTOR_ONE, SDL_BLENDOPERATION_SUBTRACT);
+                    SDL_SetTextureBlendMode(internals->composition, mode);
+                    break;
+                }
+            case LV_BLEND_MODE_MULTIPLY: {
+                    SDL_BlendMode mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ZERO, SDL_BLENDFACTOR_SRC_COLOR,
+                                                                    SDL_BLENDOPERATION_ADD, SDL_BLENDFACTOR_ZERO,
+                                                                    SDL_BLENDFACTOR_DST_ALPHA, SDL_BLENDOPERATION_ADD);
+                    SDL_SetTextureBlendMode(internals->composition, mode);
+                    break;
+                }
+#endif
+            default:
+                LV_LOG_WARN("Doesn't support blend mode %d", blend_mode);
+                SDL_SetTextureBlendMode(internals->composition, SDL_BLENDMODE_BLEND);
+                /* Unsupported yet */
+                break;
+        }
+        SDL_RenderCopy(ctx->renderer, internals->composition, &src_rect, &dst_rect);
+    }
+
+    internals->mask = internals->composition = NULL;
+}
+
+SDL_Texture * lv_draw_sdl_composite_texture_obtain(lv_draw_sdl_ctx_t * ctx, lv_draw_sdl_composite_texture_id_t id,
+                                                   lv_coord_t w, lv_coord_t h)
+{
+    lv_point_t * tex_size = NULL;
+    composite_key_t mask_key = mask_key_create(id);
+    SDL_Texture * result = lv_draw_sdl_texture_cache_get_with_userdata(ctx, &mask_key, sizeof(composite_key_t), NULL,
+                                                                       (void **) &tex_size);
+    if(!result || tex_size->x < w || tex_size->y < h) {
+        lv_coord_t size = next_pow_of_2(LV_MAX(w, h));
+        int access = SDL_TEXTUREACCESS_STREAMING;
+        if(id >= LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_TARGET0) {
+            access = SDL_TEXTUREACCESS_TARGET;
+        }
+        result = SDL_CreateTexture(ctx->renderer, LV_DRAW_SDL_TEXTURE_FORMAT, access, size, size);
+        tex_size = lv_mem_alloc(sizeof(lv_point_t));
+        tex_size->x = tex_size->y = size;
+        lv_draw_sdl_texture_cache_put_advanced(ctx, &mask_key, sizeof(composite_key_t), result, tex_size, lv_mem_free, 0);
+    }
+    return result;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static composite_key_t mask_key_create(lv_draw_sdl_composite_texture_id_t type)
+{
+    composite_key_t key;
+    /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
+    SDL_memset(&key, 0, sizeof(key));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_MASK;
+    key.type = type;
+    return key;
+}
+
+static lv_coord_t next_pow_of_2(lv_coord_t num)
+{
+    lv_coord_t n = 128;
+    while(n < num && n < 16384) {
+        n = n << 1;
+    }
+    return n;
+}
+
+static void dump_masks(SDL_Texture * texture, const lv_area_t * coords)
+{
+    lv_coord_t w = lv_area_get_width(coords), h = lv_area_get_height(coords);
+    SDL_assert(w > 0 && h > 0);
+    SDL_Rect rect = {0, 0, w, h};
+    uint8_t * pixels;
+    int pitch;
+    if(SDL_LockTexture(texture, &rect, (void **) &pixels, &pitch) != 0) return;
+
+    lv_opa_t * line_buf = lv_mem_buf_get(rect.w);
+    for(lv_coord_t y = 0; y < rect.h; y++) {
+        lv_memset_ff(line_buf, rect.w);
+        lv_coord_t abs_x = (lv_coord_t) coords->x1, abs_y = (lv_coord_t)(y + coords->y1), len = (lv_coord_t) rect.w;
+        lv_draw_mask_res_t res;
+        res = lv_draw_mask_apply(line_buf, abs_x, abs_y, len);
+        if(res == LV_DRAW_MASK_RES_TRANSP) {
+            lv_memset_00(&pixels[y * pitch], 4 * rect.w);
+        }
+        else if(res == LV_DRAW_MASK_RES_FULL_COVER) {
+            lv_memset_ff(&pixels[y * pitch], 4 * rect.w);
+        }
+        else {
+            for(int x = 0; x < rect.w; x++) {
+                const size_t idx = y * pitch + x * 4;
+                pixels[idx] = line_buf[x];
+                pixels[idx + 1] = pixels[idx + 2] = pixels[idx + 3] = 0xFF;
+            }
+        }
+    }
+    lv_mem_buf_release(line_buf);
+    SDL_UnlockTexture(texture);
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_composite.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_composite.h
new file mode 100644
index 000000000..3050815d7
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_composite.h
@@ -0,0 +1,72 @@
+/**
+ * @file lv_draw_sdl_composite.h
+ *
+ */
+
+#ifndef LV_DRAW_SDL_COMPOSITE_H
+#define LV_DRAW_SDL_COMPOSITE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#include LV_GPU_SDL_INCLUDE_PATH
+
+#include "lv_draw_sdl.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_color.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef enum lv_draw_sdl_composite_texture_id_t {
+    LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_STREAM0,
+    LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_STREAM1,
+    LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_TARGET0,
+    LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_TARGET1,
+} lv_draw_sdl_composite_texture_id_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Begin drawing with mask. Render target will be switched to a temporary texture,
+ * and drawing coordinates may get clipped or translated
+ * @param coords_in Original coordinates
+ * @param clip_in Original clip area
+ * @param extension Useful for shadows or outlines, can be NULL
+ * @param coords_out Translated coords
+ * @param clip_out Translated clip area
+ * @param apply_area Area of actual composited texture will be drawn
+ * @return true if there are any mask needs to be drawn, false otherwise
+ */
+bool lv_draw_sdl_composite_begin(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords_in, const lv_area_t * clip_in,
+                                 const lv_area_t * extension, lv_blend_mode_t blend_mode, lv_area_t * coords_out,
+                                 lv_area_t * clip_out, lv_area_t * apply_area);
+
+void lv_draw_sdl_composite_end(lv_draw_sdl_ctx_t * ctx, const lv_area_t * apply_area, lv_blend_mode_t blend_mode);
+
+SDL_Texture * lv_draw_sdl_composite_texture_obtain(lv_draw_sdl_ctx_t * ctx, lv_draw_sdl_composite_texture_id_t id,
+                                                   lv_coord_t w, lv_coord_t h);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SDL_COMPOSITE_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_img.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_img.c
new file mode 100644
index 000000000..c6782386e
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_img.c
@@ -0,0 +1,459 @@
+/**
+ * @file lv_draw_sdl_img.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "../lv_draw_img.h"
+#include "../lv_img_cache.h"
+#include "../lv_draw_mask.h"
+#include "../../misc/lv_lru.h"
+#include "../../misc/lv_gc.h"
+
+#include "lv_draw_sdl_img.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+#include "lv_draw_sdl_rect.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    const SDL_Texture * texture;
+    lv_coord_t w, h, radius;
+} lv_draw_img_rounded_key_t;
+
+enum {
+    ROUNDED_IMG_PART_LEFT = 0,
+    ROUNDED_IMG_PART_HCENTER = 1,
+    ROUNDED_IMG_PART_RIGHT = 2,
+    ROUNDED_IMG_PART_TOP = 3,
+    ROUNDED_IMG_PART_VCENTER = 4,
+    ROUNDED_IMG_PART_BOTTOM = 5,
+};
+
+enum {
+    ROUNDED_IMG_CORNER_TOP_LEFT = 0,
+    ROUNDED_IMG_CORNER_TOP_RIGHT = 1,
+    ROUNDED_IMG_CORNER_BOTTOM_RIGHT = 2,
+    ROUNDED_IMG_CORNER_BOTTOM_LEFT = 3,
+};
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static SDL_Texture * upload_img_texture(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc);
+
+static SDL_Texture * upload_img_texture_fallback(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc);
+
+static bool check_mask_simple_radius(const lv_area_t * coords, lv_coord_t * radius);
+
+static void draw_img_simple(lv_draw_sdl_ctx_t * ctx, SDL_Texture * texture, const lv_draw_sdl_img_header_t * header,
+                            const lv_draw_img_dsc_t * draw_dsc, const lv_area_t * coords, const lv_area_t * clip);
+
+static void draw_img_rounded(lv_draw_sdl_ctx_t * ctx, SDL_Texture * texture, const lv_draw_sdl_img_header_t * header,
+                             const lv_draw_img_dsc_t * draw_dsc, const lv_area_t * coords, const lv_area_t * clip,
+                             lv_coord_t radius);
+
+static SDL_Texture * img_rounded_frag_obtain(lv_draw_sdl_ctx_t * ctx, SDL_Texture * texture,
+                                             const lv_draw_sdl_img_header_t * header, int w, int h, lv_coord_t radius);
+
+static lv_draw_img_rounded_key_t rounded_key_create(const SDL_Texture * texture, lv_coord_t w, lv_coord_t h,
+                                                    lv_coord_t radius);
+
+static void calc_draw_part(SDL_Texture * texture, const lv_draw_sdl_img_header_t * header, const lv_area_t * coords,
+                           const lv_area_t * clip, SDL_Rect * clipped_src, SDL_Rect * clipped_dst);
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+static void apply_recolor_opa(SDL_Texture * texture, const lv_draw_img_dsc_t * draw_dsc);
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+lv_res_t lv_draw_sdl_img_core(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                              const lv_area_t * coords, const void * src)
+{
+    const lv_area_t * clip = draw_ctx->clip_area;
+    lv_draw_sdl_ctx_t * ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+
+    size_t key_size;
+    lv_draw_sdl_cache_key_head_img_t * key = lv_draw_sdl_texture_img_key_create(src, draw_dsc->frame_id, &key_size);
+    bool texture_found = false;
+    lv_draw_sdl_img_header_t * header = NULL;
+    SDL_Texture * texture = lv_draw_sdl_texture_cache_get_with_userdata(ctx, key, key_size, &texture_found,
+                                                                        (void **) &header);
+    if(!texture_found) {
+        lv_draw_sdl_img_load_texture(ctx, key, key_size, src, draw_dsc->frame_id, &texture, &header);
+    }
+    SDL_free(key);
+    if(!texture) {
+        return LV_RES_INV;
+    }
+
+    lv_area_t zoomed_cords;
+    _lv_img_buf_get_transformed_area(&zoomed_cords, lv_area_get_width(coords), lv_area_get_height(coords), 0,
+                                     draw_dsc->zoom, &draw_dsc->pivot);
+    lv_area_move(&zoomed_cords, coords->x1, coords->y1);
+
+    /* When in > 0, draw simple radius */
+    lv_coord_t radius = 0;
+    /* Coords will be translated so coords will start at (0,0) */
+    lv_area_t t_coords = zoomed_cords, t_clip = *clip, apply_area;
+
+    if(!check_mask_simple_radius(&t_coords, &radius)) {
+        lv_draw_sdl_composite_begin(ctx, &zoomed_cords, clip, NULL, draw_dsc->blend_mode,
+                                    &t_coords, &t_clip, &apply_area);
+    }
+
+    SDL_Rect clip_rect, coords_rect;
+    lv_area_to_sdl_rect(&t_clip, &clip_rect);
+    lv_area_to_sdl_rect(&t_coords, &coords_rect);
+
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+
+    if(radius > 0) {
+        draw_img_rounded(ctx, texture, header, draw_dsc, &t_coords, &t_clip, radius);
+    }
+    else {
+        draw_img_simple(ctx, texture, header, draw_dsc, &t_coords, &t_clip);
+    }
+
+    lv_draw_sdl_composite_end(ctx, &apply_area, draw_dsc->blend_mode);
+
+    return LV_RES_OK;
+}
+
+static void calc_draw_part(SDL_Texture * texture, const lv_draw_sdl_img_header_t * header, const lv_area_t * coords,
+                           const lv_area_t * clip, SDL_Rect * clipped_src, SDL_Rect * clipped_dst)
+{
+    double x = 0, y = 0, w, h;
+    if(SDL_RectEmpty(&header->rect)) {
+        Uint32 format = 0;
+        int access = 0, tw, th;
+        SDL_QueryTexture(texture, &format, &access, &tw, &th);
+        w = tw;
+        h = th;
+    }
+    else {
+        x = header->rect.x;
+        y = header->rect.y;
+        w = header->rect.w;
+        h = header->rect.h;
+    }
+    if(clip) {
+        lv_area_t clipped_area;
+        _lv_area_intersect(&clipped_area, coords, clip);
+        lv_area_to_sdl_rect(&clipped_area, clipped_dst);
+    }
+    else {
+        lv_area_to_sdl_rect(coords, clipped_dst);
+    }
+    lv_coord_t coords_w = lv_area_get_width(coords), coords_h = lv_area_get_height(coords);
+    clipped_src->x = (int)(x + (clipped_dst->x - coords->x1) * w / coords_w);
+    clipped_src->y = (int)(y + (clipped_dst->y - coords->y1) * h / coords_h);
+    clipped_src->w = (int)(w - (coords_w - clipped_dst->w) * w / coords_w);
+    clipped_src->h = (int)(h - (coords_h - clipped_dst->h) * h / coords_h);
+}
+
+bool lv_draw_sdl_img_load_texture(lv_draw_sdl_ctx_t * ctx, lv_draw_sdl_cache_key_head_img_t * key, size_t key_size,
+                                  const void * src, int32_t frame_id, SDL_Texture ** texture,
+                                  lv_draw_sdl_img_header_t ** header)
+{
+    _lv_img_cache_entry_t * cdsc = _lv_img_cache_open(src, lv_color_white(), frame_id);
+    lv_draw_sdl_cache_flag_t tex_flags = 0;
+    SDL_Rect rect;
+    SDL_memset(&rect, 0, sizeof(SDL_Rect));
+    if(cdsc) {
+        lv_img_decoder_dsc_t * dsc = &cdsc->dec_dsc;
+        if(dsc->user_data && SDL_memcmp(dsc->user_data, LV_DRAW_SDL_DEC_DSC_TEXTURE_HEAD, 8) == 0) {
+            lv_draw_sdl_dec_dsc_userdata_t * ptr = (lv_draw_sdl_dec_dsc_userdata_t *) dsc->user_data;
+            *texture = ptr->texture;
+            rect = ptr->rect;
+            if(ptr->texture_managed) {
+                tex_flags |= LV_DRAW_SDL_CACHE_FLAG_MANAGED;
+            }
+            ptr->texture_referenced = true;
+        }
+        else {
+            *texture = upload_img_texture(ctx->renderer, dsc);
+        }
+#if LV_IMG_CACHE_DEF_SIZE == 0
+        lv_img_decoder_close(dsc);
+#endif
+    }
+    if(texture && cdsc) {
+        *header = SDL_malloc(sizeof(lv_draw_sdl_img_header_t));
+        SDL_memcpy(&(*header)->base, &cdsc->dec_dsc.header, sizeof(lv_img_header_t));
+        (*header)->rect = rect;
+        lv_draw_sdl_texture_cache_put_advanced(ctx, key, key_size, *texture, *header, SDL_free, tex_flags);
+    }
+    else {
+        lv_draw_sdl_texture_cache_put(ctx, key, key_size, NULL);
+        return false;
+    }
+    return true;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static SDL_Texture * upload_img_texture(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc)
+{
+    if(!dsc->img_data) {
+        return upload_img_texture_fallback(renderer, dsc);
+    }
+    bool chroma_keyed = dsc->header.cf == (uint32_t) LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED;
+    int h = (int) dsc->header.h;
+    int w = (int) dsc->header.w;
+    void * data = (void *) dsc->img_data;
+    Uint32 rmask = 0x00FF0000;
+    Uint32 gmask = 0x0000FF00;
+    Uint32 bmask = 0x000000FF;
+    Uint32 amask = 0xFF000000;
+    if(chroma_keyed) {
+        amask = 0x00;
+    }
+    SDL_Surface * surface = SDL_CreateRGBSurfaceFrom(data, w, h, LV_COLOR_DEPTH, w * LV_COLOR_DEPTH / 8,
+                                                     rmask, gmask, bmask, amask);
+    SDL_SetColorKey(surface, chroma_keyed, lv_color_to32(LV_COLOR_CHROMA_KEY));
+    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
+    SDL_FreeSurface(surface);
+    return texture;
+}
+
+static SDL_Texture * upload_img_texture_fallback(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc)
+{
+    lv_coord_t h = (lv_coord_t) dsc->header.h;
+    lv_coord_t w = (lv_coord_t) dsc->header.w;
+    uint8_t * data = lv_mem_buf_get(w * h * sizeof(lv_color_t));
+    for(lv_coord_t y = 0; y < h; y++) {
+        lv_img_decoder_read_line(dsc, 0, y, w, &data[y * w * sizeof(lv_color_t)]);
+    }
+    Uint32 rmask = 0x00FF0000;
+    Uint32 gmask = 0x0000FF00;
+    Uint32 bmask = 0x000000FF;
+    Uint32 amask = 0xFF000000;
+    SDL_Surface * surface = SDL_CreateRGBSurfaceFrom(data, w, h, LV_COLOR_DEPTH, w * LV_COLOR_DEPTH / 8,
+                                                     rmask, gmask, bmask, amask);
+    SDL_SetColorKey(surface, SDL_TRUE, lv_color_to32(LV_COLOR_CHROMA_KEY));
+    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
+    SDL_FreeSurface(surface);
+    lv_mem_buf_release(data);
+    return texture;
+}
+
+/**
+ * Check if there is only one radius mask
+ * @param radius Set to radius value if the only mask is a radius mask
+ * @return true if the only mask is a radius mask
+ */
+static bool check_mask_simple_radius(const lv_area_t * coords, lv_coord_t * radius)
+{
+    if(lv_draw_mask_get_cnt() != 1) return false;
+    for(uint8_t i = 0; i < _LV_MASK_MAX_NUM; i++) {
+        _lv_draw_mask_common_dsc_t * param = LV_GC_ROOT(_lv_draw_mask_list[i]).param;
+        if(param->type == LV_DRAW_MASK_TYPE_RADIUS) {
+            lv_draw_mask_radius_param_t * rparam = (lv_draw_mask_radius_param_t *) param;
+            if(rparam->cfg.outer) return false;
+            if(!_lv_area_is_equal(&rparam->cfg.rect, coords)) return false;
+            *radius = rparam->cfg.radius;
+            return true;
+        }
+    }
+    return false;
+}
+
+static void draw_img_simple(lv_draw_sdl_ctx_t * ctx, SDL_Texture * texture, const lv_draw_sdl_img_header_t * header,
+                            const lv_draw_img_dsc_t * draw_dsc, const lv_area_t * coords, const lv_area_t * clip)
+{
+    apply_recolor_opa(texture, draw_dsc);
+    SDL_Point pivot = {.x = draw_dsc->pivot.x, .y = draw_dsc->pivot.y};
+
+    /*Image needs to be rotated, so we have to use clip rect which is slower*/
+    if(draw_dsc->angle != 0) {
+        /* No radius, set clip here */
+        SDL_Rect clip_rect;
+        lv_area_to_sdl_rect(clip, &clip_rect);
+        SDL_RenderSetClipRect(ctx->renderer, &clip_rect);
+    }
+    SDL_Rect src_rect, dst_rect;
+    calc_draw_part(texture, header, coords, clip, &src_rect, &dst_rect);
+    SDL_RenderCopyEx(ctx->renderer, texture, &src_rect, &dst_rect, draw_dsc->angle, &pivot, SDL_FLIP_NONE);
+    if(draw_dsc->angle != 0) {
+        SDL_RenderSetClipRect(ctx->renderer, NULL);
+    }
+}
+
+
+static void draw_img_rounded(lv_draw_sdl_ctx_t * ctx, SDL_Texture * texture, const lv_draw_sdl_img_header_t * header,
+                             const lv_draw_img_dsc_t * draw_dsc, const lv_area_t * coords, const lv_area_t * clip,
+                             lv_coord_t radius)
+{
+    const int w = lv_area_get_width(coords), h = lv_area_get_height(coords);
+    lv_coord_t real_radius = LV_MIN3(radius, w, h);
+    SDL_Texture * frag = img_rounded_frag_obtain(ctx, texture, header, w, h, real_radius);
+    apply_recolor_opa(frag, draw_dsc);
+    lv_draw_sdl_rect_bg_frag_draw_corners(ctx, frag, real_radius, coords, clip, true);
+
+    apply_recolor_opa(texture, draw_dsc);
+
+    SDL_Rect src_rect, dst_rect;
+    /* Draw 3 parts */
+    lv_area_t clip_tmp, part;
+    calc_draw_part(texture, header, coords, NULL, &src_rect, &dst_rect);
+    for(int i = w > h ? ROUNDED_IMG_PART_LEFT : ROUNDED_IMG_PART_TOP, j = i + 3; i <= j; i++) {
+        switch(i) {
+            case ROUNDED_IMG_PART_LEFT:
+                lv_area_set(&part, coords->x1, coords->y1 + radius, coords->x1 + radius - 1, coords->y2 - radius);
+                break;
+            case ROUNDED_IMG_PART_HCENTER:
+                lv_area_set(&part, coords->x1 + radius, coords->y1, coords->x2 - radius, coords->y2);
+                break;
+            case ROUNDED_IMG_PART_RIGHT:
+                lv_area_set(&part, coords->x2 - radius + 1, coords->y1 + radius, coords->x2, coords->y2 - radius);
+                break;
+            case ROUNDED_IMG_PART_TOP:
+                lv_area_set(&part, coords->x1 + radius, coords->y1, coords->x2 - radius, coords->y1 + radius - 1);
+                break;
+            case ROUNDED_IMG_PART_VCENTER:
+                lv_area_set(&part, coords->x1 + radius, coords->y2 - radius + 1, coords->x2 - radius, coords->y2);
+                break;
+            case ROUNDED_IMG_PART_BOTTOM:
+                lv_area_set(&part, coords->x1, coords->y1 + radius, coords->x2, coords->y2 - radius);
+                break;
+            default:
+                break;
+        }
+        if(!_lv_area_intersect(&clip_tmp, &part, clip)) continue;
+        SDL_Rect clip_rect;
+        lv_area_to_sdl_rect(&clip_tmp, &clip_rect);
+        SDL_RenderSetClipRect(ctx->renderer, &clip_rect);
+        SDL_RenderCopy(ctx->renderer, texture, &src_rect, &dst_rect);
+    }
+    SDL_RenderSetClipRect(ctx->renderer, NULL);
+}
+
+static void apply_recolor_opa(SDL_Texture * texture, const lv_draw_img_dsc_t * draw_dsc)
+{
+    if(draw_dsc->recolor_opa > LV_OPA_TRANSP) {
+        /* Draw with mixed recolor */
+        lv_color_t recolor = lv_color_mix(draw_dsc->recolor, lv_color_white(), draw_dsc->recolor_opa);
+        SDL_SetTextureColorMod(texture, recolor.ch.red, recolor.ch.green, recolor.ch.blue);
+    }
+    else {
+        /* Draw with no recolor */
+        SDL_SetTextureColorMod(texture, 0xFF, 0xFF, 0xFF);
+    }
+    SDL_SetTextureAlphaMod(texture, draw_dsc->opa);
+}
+
+static SDL_Texture * img_rounded_frag_obtain(lv_draw_sdl_ctx_t * ctx, SDL_Texture * texture,
+                                             const lv_draw_sdl_img_header_t * header, int w, int h, lv_coord_t radius)
+{
+    lv_draw_img_rounded_key_t key = rounded_key_create(texture, w, h, radius);
+    SDL_Texture * mask_frag = lv_draw_sdl_rect_bg_frag_obtain(ctx, radius);
+    SDL_Texture * img_frag = lv_draw_sdl_texture_cache_get(ctx, &key, sizeof(key), NULL);
+    if(img_frag == NULL) {
+        const lv_coord_t full_frag_size = radius * 2 + 3;
+        img_frag = SDL_CreateTexture(ctx->renderer, LV_DRAW_SDL_TEXTURE_FORMAT, SDL_TEXTUREACCESS_TARGET,
+                                     full_frag_size, full_frag_size);
+        SDL_SetTextureBlendMode(img_frag, SDL_BLENDMODE_BLEND);
+        SDL_Texture * old_target = SDL_GetRenderTarget(ctx->renderer);
+        SDL_SetRenderTarget(ctx->renderer, img_frag);
+        SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 0);
+        SDL_RenderClear(ctx->renderer);
+
+        lv_area_t coords = {0, 0, w - 1, h - 1}, clip;
+        lv_area_t frag_coords = {0, 0, full_frag_size - 1, full_frag_size - 1};
+        lv_draw_sdl_rect_bg_frag_draw_corners(ctx, mask_frag, radius, &frag_coords, NULL, false);
+
+        SDL_SetTextureAlphaMod(texture, 0xFF);
+        SDL_SetTextureColorMod(texture, 0xFF, 0xFF, 0xFF);
+#if LV_GPU_SDL_CUSTOM_BLEND_MODE
+        SDL_BlendMode blend_mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ZERO,
+                                                              SDL_BLENDOPERATION_ADD, SDL_BLENDFACTOR_DST_ALPHA,
+                                                              SDL_BLENDFACTOR_ZERO, SDL_BLENDOPERATION_ADD);
+        SDL_SetTextureBlendMode(texture, blend_mode);
+#else
+        SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_MOD);
+#endif
+        SDL_Rect srcrect, cliprect, dstrect = {0, 0, radius, radius};
+
+        cliprect.w = cliprect.h = radius;
+        for(int i = 0; i <= ROUNDED_IMG_CORNER_BOTTOM_LEFT; i++) {
+            switch(i) {
+                case ROUNDED_IMG_CORNER_TOP_LEFT:
+                    cliprect.x = 0;
+                    cliprect.y = 0;
+                    lv_area_align(&frag_coords, &coords, LV_ALIGN_TOP_LEFT, 0, 0);
+                    break;
+                case ROUNDED_IMG_CORNER_TOP_RIGHT:
+                    cliprect.x = full_frag_size - radius;
+                    cliprect.y = 0;
+                    lv_area_align(&frag_coords, &coords, LV_ALIGN_TOP_RIGHT, 0, 0);
+                    break;
+                case ROUNDED_IMG_CORNER_BOTTOM_RIGHT:
+                    cliprect.x = full_frag_size - radius;
+                    cliprect.y = full_frag_size - radius;
+                    lv_area_align(&frag_coords, &coords, LV_ALIGN_BOTTOM_RIGHT, 0, 0);
+                    break;
+                case ROUNDED_IMG_CORNER_BOTTOM_LEFT:
+                    cliprect.x = 0;
+                    cliprect.y = full_frag_size - radius;
+                    lv_area_align(&frag_coords, &coords, LV_ALIGN_BOTTOM_LEFT, 0, 0);
+                    break;
+                default:
+                    break;
+            }
+            calc_draw_part(texture, header, &coords, NULL, &srcrect, &dstrect);
+            SDL_RenderSetClipRect(ctx->renderer, &cliprect);
+            SDL_RenderCopy(ctx->renderer, texture, &srcrect, &dstrect);
+        }
+        SDL_RenderSetClipRect(ctx->renderer, NULL);
+
+        SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+
+        SDL_SetRenderTarget(ctx->renderer, old_target);
+        lv_draw_sdl_texture_cache_put(ctx, &key, sizeof(key), img_frag);
+    }
+    return img_frag;
+}
+
+static lv_draw_img_rounded_key_t rounded_key_create(const SDL_Texture * texture, lv_coord_t w, lv_coord_t h,
+                                                    lv_coord_t radius)
+{
+    lv_draw_img_rounded_key_t key;
+    SDL_memset(&key, 0, sizeof(key));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_IMG_ROUNDED_CORNERS;
+    key.texture = texture;
+    key.w = w;
+    key.h = h;
+    key.radius = radius;
+    return key;
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_img.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_img.h
new file mode 100644
index 000000000..0e2702772
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_img.h
@@ -0,0 +1,72 @@
+/**
+ * @file lv_draw_sdl_img.h
+ *
+ */
+
+#ifndef LV_DRAW_SDL_IMG_H
+#define LV_DRAW_SDL_IMG_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include LV_GPU_SDL_INCLUDE_PATH
+
+#include "../lv_draw.h"
+
+#include "lv_draw_sdl_texture_cache.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct lv_draw_sdl_img_header_t {
+    lv_img_header_t base;
+    SDL_Rect rect;
+} lv_draw_sdl_img_header_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/*======================
+ * Add/remove functions
+ *=====================*/
+
+/*=====================
+ * Setter functions
+ *====================*/
+
+/*=====================
+ * Getter functions
+ *====================*/
+
+/*=====================
+ * Other functions
+ *====================*/
+bool lv_draw_sdl_img_load_texture(lv_draw_sdl_ctx_t * ctx, lv_draw_sdl_cache_key_head_img_t * key, size_t key_size,
+                                  const void * src, int32_t frame_id, SDL_Texture ** texture,
+                                  lv_draw_sdl_img_header_t ** header);
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*LV_USE_GPU_SDL*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SDL_IMG_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_label.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_label.c
new file mode 100644
index 000000000..a067c8af4
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_label.c
@@ -0,0 +1,158 @@
+/**
+ * @file lv_draw_sdl_label.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include LV_GPU_SDL_INCLUDE_PATH
+
+#include "../lv_draw_label.h"
+#include "../../misc/lv_utils.h"
+
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    const lv_font_t * font_p;
+    uint32_t letter;
+} lv_font_glyph_key_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static lv_font_glyph_key_t font_key_glyph_create(const lv_font_t * font_p, uint32_t letter);
+
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sdl_draw_letter(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,  const lv_point_t * pos_p,
+                             uint32_t letter)
+{
+    const lv_area_t * clip_area = draw_ctx->clip_area;
+    const lv_font_t * font_p = dsc->font;
+    lv_opa_t opa = dsc->opa;
+    lv_color_t color = dsc->color;
+    if(opa < LV_OPA_MIN) return;
+    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
+
+    if(font_p == NULL) {
+        LV_LOG_WARN("lv_draw_letter: font is NULL");
+        return;
+    }
+
+    lv_font_glyph_dsc_t g;
+    bool g_ret = lv_font_get_glyph_dsc(font_p, &g, letter, '\0');
+    if(g_ret == false) {
+        /*Add warning if the dsc is not found
+         *but do not print warning for non printable ASCII chars (e.g. '\n')*/
+        if(letter >= 0x20 &&
+           letter != 0xf8ff && /*LV_SYMBOL_DUMMY*/
+           letter != 0x200c) { /*ZERO WIDTH NON-JOINER*/
+            LV_LOG_WARN("lv_draw_letter: glyph dsc. not found for U+%X", letter);
+        }
+        return;
+    }
+
+    /*Don't draw anything if the character is empty. E.g. space*/
+    if((g.box_h == 0) || (g.box_w == 0)) return;
+
+    int32_t pos_x = pos_p->x + g.ofs_x;
+    int32_t pos_y = pos_p->y + (font_p->line_height - font_p->base_line) - g.box_h - g.ofs_y;
+
+    const lv_area_t letter_area = {pos_x, pos_y, pos_x + g.box_w - 1, pos_y + g.box_h - 1};
+    lv_area_t draw_area;
+
+    /*If the letter is completely out of mask don't draw it*/
+    if(!_lv_area_intersect(&draw_area, &letter_area, clip_area)) {
+        return;
+    }
+
+    lv_draw_sdl_ctx_t * ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+    SDL_Renderer * renderer = ctx->renderer;
+
+    lv_font_glyph_key_t glyph_key = font_key_glyph_create(font_p, letter);
+    bool glyph_found = false;
+    SDL_Texture * texture = lv_draw_sdl_texture_cache_get(ctx, &glyph_key, sizeof(glyph_key), &glyph_found);
+    if(!glyph_found) {
+        if(g.resolved_font) {
+            font_p = g.resolved_font;
+        }
+        const uint8_t * bmp = lv_font_get_glyph_bitmap(font_p, letter);
+        uint8_t * buf = lv_mem_alloc(g.box_w * g.box_h);
+        lv_sdl_to_8bpp(buf, bmp, g.box_w, g.box_h, g.box_w, g.bpp);
+        SDL_Surface * mask = lv_sdl_create_opa_surface(buf, g.box_w, g.box_h, g.box_w);
+        texture = SDL_CreateTextureFromSurface(renderer, mask);
+        SDL_FreeSurface(mask);
+        lv_mem_free(buf);
+        lv_draw_sdl_texture_cache_put(ctx, &glyph_key, sizeof(glyph_key), texture);
+    }
+    if(!texture) {
+        return;
+    }
+
+    lv_area_t t_letter = letter_area, t_clip = *clip_area, apply_area;
+    bool has_mask = lv_draw_sdl_composite_begin(ctx, &letter_area, clip_area, NULL, dsc->blend_mode, &t_letter, &t_clip,
+                                                &apply_area);
+
+    /*If the letter is completely out of mask don't draw it*/
+    if(!_lv_area_intersect(&draw_area, &t_letter, &t_clip)) {
+        return;
+    }
+    SDL_Rect srcrect, dstrect;
+    lv_area_to_sdl_rect(&draw_area, &dstrect);
+    srcrect.x = draw_area.x1 - t_letter.x1;
+    srcrect.y = draw_area.y1 - t_letter.y1;
+    srcrect.w = dstrect.w;
+    srcrect.h = dstrect.h;
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    SDL_SetTextureAlphaMod(texture, opa);
+    SDL_SetTextureColorMod(texture, color.ch.red, color.ch.green, color.ch.blue);
+    SDL_RenderCopy(renderer, texture, &srcrect, &dstrect);
+
+    lv_draw_sdl_composite_end(ctx, &apply_area, dsc->blend_mode);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static lv_font_glyph_key_t font_key_glyph_create(const lv_font_t * font_p, uint32_t letter)
+{
+    lv_font_glyph_key_t key;
+    /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
+    SDL_memset(&key, 0, sizeof(key));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_FONT_GLYPH;
+    key.font_p = font_p;
+    key.letter = letter;
+    return key;
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_line.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_line.c
new file mode 100644
index 000000000..8dd7b2e00
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_line.c
@@ -0,0 +1,154 @@
+/**
+ * @file lv_draw_sdl_line.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "lv_draw_sdl.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+#include "lv_draw_sdl_mask.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define ROUND_START 0x01
+#define ROUND_END 0x02
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    lv_coord_t length;
+    lv_coord_t width;
+    uint8_t round;
+} lv_draw_line_key_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+static lv_draw_line_key_t line_key_create(const lv_draw_line_dsc_t * dsc, lv_coord_t length);
+
+static SDL_Texture * line_texture_create(lv_draw_sdl_ctx_t * sdl_ctx, const lv_draw_line_dsc_t * dsc,
+                                         lv_coord_t length);
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+void lv_draw_sdl_draw_line(lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc, const lv_point_t * point1,
+                           const lv_point_t * point2)
+{
+    lv_draw_sdl_ctx_t * sdl_ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+    SDL_Renderer * renderer = sdl_ctx->renderer;
+    lv_coord_t x1 = point1->x, x2 = point2->x, y1 = point1->y, y2 = point2->y;
+    double length = SDL_sqrt(SDL_pow(x2 - x1, 2) + SDL_pow(y2 - y1, 2));
+    if(length - (long) length > 0.5) {
+        length = (long) length + 1;
+    }
+
+    double angle = SDL_atan2(y2 - y1, x2 - x1) * 180 / M_PI;
+    lv_draw_line_key_t key = line_key_create(dsc, (lv_coord_t) length);
+    SDL_Texture * texture = lv_draw_sdl_texture_cache_get(sdl_ctx, &key, sizeof(key), NULL);
+    if(!texture) {
+        texture = line_texture_create(sdl_ctx, dsc, (lv_coord_t) length);
+        lv_draw_sdl_texture_cache_put(sdl_ctx, &key, sizeof(key), texture);
+    }
+
+    lv_area_t coords = {x1, y1, x2, y2};
+    const lv_area_t * clip = draw_ctx->clip_area;
+
+    SDL_Rect coords_r, clip_r;
+    lv_area_to_sdl_rect(&coords, &coords_r);
+    lv_area_to_sdl_rect(clip, &clip_r);
+
+    lv_area_t t_coords = coords, t_clip = *clip, apply_area;
+    lv_area_t extension = {dsc->width / 2, dsc->width / 2, dsc->width / 2, dsc->width / 2};
+    lv_draw_sdl_composite_begin(sdl_ctx, &coords, clip, &extension, dsc->blend_mode, &t_coords, &t_clip,
+                                &apply_area);
+
+    SDL_Color color;
+    lv_color_to_sdl_color(&dsc->color, &color);
+
+    SDL_SetTextureColorMod(texture, color.r, color.g, color.b);
+    SDL_SetTextureAlphaMod(texture, dsc->opa);
+    SDL_Rect srcrect = {0, 0, (int) length + dsc->width + 2, dsc->width + 2},
+             dstrect = {t_coords.x1 - 1 - dsc->width / 2, t_coords.y1 - 1, srcrect.w, srcrect.h};
+    SDL_Point center = {1 + dsc->width / 2, 1 + dsc->width / 2};
+
+    SDL_Rect clip_rect;
+    lv_area_to_sdl_rect(&t_clip, &clip_rect);
+    if(!SDL_RectEquals(&clip_rect, &dstrect) || angle != 0) {
+        SDL_RenderSetClipRect(renderer, &clip_rect);
+    }
+    SDL_RenderCopyEx(renderer, texture, &srcrect, &dstrect, angle, &center, 0);
+    SDL_RenderSetClipRect(renderer, NULL);
+
+    lv_draw_sdl_composite_end(sdl_ctx, &apply_area, dsc->blend_mode);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static lv_draw_line_key_t line_key_create(const lv_draw_line_dsc_t * dsc, lv_coord_t length)
+{
+    lv_draw_line_key_t key;
+    lv_memset_00(&key, sizeof(lv_draw_line_key_t));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_LINE;
+    key.length = length;
+    key.width = dsc->width;
+    key.round = (dsc->round_start ? ROUND_START : 0) | (dsc->round_end ? ROUND_END : 0);
+    return key;
+}
+
+static SDL_Texture * line_texture_create(lv_draw_sdl_ctx_t * sdl_ctx, const lv_draw_line_dsc_t * dsc, lv_coord_t length)
+{
+    SDL_Texture * texture = SDL_CreateTexture(sdl_ctx->renderer, LV_DRAW_SDL_TEXTURE_FORMAT, SDL_TEXTUREACCESS_TARGET,
+                                              length + dsc->width + 2, dsc->width + 2);
+    SDL_Texture * target = SDL_GetRenderTarget(sdl_ctx->renderer);
+    SDL_SetRenderTarget(sdl_ctx->renderer, texture);
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    SDL_SetRenderDrawColor(sdl_ctx->renderer, 0xFF, 0xFF, 0xFF, 0x0);
+    SDL_RenderClear(sdl_ctx->renderer);
+    SDL_SetRenderDrawColor(sdl_ctx->renderer, 0xFF, 0xFF, 0xFF, 0xFF);
+    SDL_Rect line_rect = {1 + dsc->width / 2, 1, length, dsc->width};
+    SDL_RenderFillRect(sdl_ctx->renderer, &line_rect);
+    if(dsc->round_start || dsc->round_end) {
+        lv_draw_mask_radius_param_t param;
+        lv_area_t round_area = {0, 0, dsc->width - 1, dsc->width - 1};
+        lv_draw_mask_radius_init(&param, &round_area, LV_RADIUS_CIRCLE, false);
+
+        int16_t mask_id = lv_draw_mask_add(&param, NULL);
+        SDL_Texture * round_texture = lv_draw_sdl_mask_dump_texture(sdl_ctx->renderer, &round_area, &mask_id, 1);
+        lv_draw_mask_remove_id(mask_id);
+
+        SDL_Rect round_src = {0, 0, dsc->width, dsc->width};
+        SDL_Rect round_dst = {line_rect.x - dsc->width / 2, 1, dsc->width, dsc->width};
+        SDL_RenderCopy(sdl_ctx->renderer, round_texture, &round_src, &round_dst);
+        round_dst.x = line_rect.w + dsc->width / 2;
+        SDL_RenderCopy(sdl_ctx->renderer, round_texture, &round_src, &round_dst);
+        SDL_DestroyTexture(round_texture);
+    }
+
+    SDL_SetRenderTarget(sdl_ctx->renderer, target);
+    return texture;
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_mask.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_mask.c
similarity index 50%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_mask.c
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_mask.c
index 263c457c5..7bb5bbb3b 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_mask.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_mask.c
@@ -1,24 +1,25 @@
 /**
- * @file lv_gpu_sdl_mask.c
+ * @file lv_draw_sdl_mask.c
  *
  */
 
 /*********************
  *      INCLUDES
  *********************/
-
 #include "../../lv_conf_internal.h"
 
 #if LV_USE_GPU_SDL
 
-#include "../../draw/lv_draw_mask.h"
-#include "../../misc/lv_mem.h"
-#include "lv_gpu_sdl_mask.h"
-#include "lv_gpu_sdl_utils.h"
+#include "../../misc/lv_gc.h"
+#include "lv_draw_sdl_mask.h"
+#include "lv_draw_sdl_utils.h"
 
 /*********************
  *      DEFINES
  *********************/
+#ifndef HAVE_SDL_CUSTOM_BLEND_MODE
+    #define HAVE_SDL_CUSTOM_BLEND_MODE (SDL_VERSION_ATLEAST(2, 0, 6))
+#endif
 
 /**********************
  *      TYPEDEFS
@@ -40,26 +41,7 @@
  *   GLOBAL FUNCTIONS
  **********************/
 
-
-SDL_Surface * lv_sdl_create_mask_surface(lv_opa_t * pixels, lv_coord_t width, lv_coord_t height, lv_coord_t stride)
-{
-    SDL_Surface * indexed = SDL_CreateRGBSurfaceFrom(pixels, width, height, 8, stride, 0, 0, 0, 0);
-    SDL_SetSurfacePalette(indexed, lv_sdl_get_grayscale_palette(8));
-    SDL_Surface * converted = SDL_ConvertSurfaceFormat(indexed, SDL_PIXELFORMAT_ARGB8888, 0);
-    SDL_FreeSurface(indexed);
-    return converted;
-}
-
-SDL_Texture * lv_sdl_create_mask_texture(SDL_Renderer * renderer, lv_opa_t * pixels, lv_coord_t width,
-                                         lv_coord_t height, lv_coord_t stride)
-{
-    SDL_Surface * indexed = lv_sdl_create_mask_surface(pixels, width, height, stride);
-    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, indexed);
-    SDL_FreeSurface(indexed);
-    return texture;
-}
-
-lv_opa_t * lv_draw_mask_dump(const lv_area_t * coords, const int16_t * ids, int16_t ids_count)
+lv_opa_t * lv_draw_sdl_mask_dump_opa(const lv_area_t * coords, const int16_t * ids, int16_t ids_count)
 {
     SDL_assert(coords->x2 >= coords->x1);
     SDL_assert(coords->y2 >= coords->y1);
@@ -83,28 +65,20 @@ lv_opa_t * lv_draw_mask_dump(const lv_area_t * coords, const int16_t * ids, int1
     return mask_buf;
 }
 
-SDL_Surface * lv_sdl_apply_mask_surface(const lv_area_t * coords, const int16_t * ids, int16_t ids_count)
+SDL_Texture * lv_draw_sdl_mask_dump_texture(SDL_Renderer * renderer, const lv_area_t * coords, const int16_t * ids,
+                                            int16_t ids_count)
 {
     lv_coord_t w = lv_area_get_width(coords), h = lv_area_get_height(coords);
-
-    lv_opa_t * mask_buf = lv_draw_mask_dump(coords, ids, ids_count);
+    lv_opa_t * mask_buf = lv_draw_sdl_mask_dump_opa(coords, ids, ids_count);
+    SDL_Surface * surface = lv_sdl_create_opa_surface(mask_buf, w, h, w);
     lv_mem_buf_release(mask_buf);
-    return lv_sdl_create_mask_surface(mask_buf, w, h, w);
-}
-
-SDL_Texture * lv_sdl_gen_mask_texture(SDL_Renderer * renderer, const lv_area_t * coords, const int16_t * ids,
-                                      int16_t ids_count)
-{
-    SDL_Surface * indexed = lv_sdl_apply_mask_surface(coords, ids, ids_count);
-    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, indexed);
-    SDL_FreeSurface(indexed);
+    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
+    SDL_FreeSurface(surface);
     return texture;
 }
 
-
 /**********************
  *   STATIC FUNCTIONS
  **********************/
 
-
 #endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_mask.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_mask.h
new file mode 100644
index 000000000..a562d73d7
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_mask.h
@@ -0,0 +1,51 @@
+/**
+ * @file lv_draw_sdl_mask.h
+ *
+ */
+
+#ifndef LV_DRAW_SDL_MASK_H
+#define LV_DRAW_SDL_MASK_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#include LV_GPU_SDL_INCLUDE_PATH
+
+#include "lv_draw_sdl.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_color.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+lv_opa_t * lv_draw_sdl_mask_dump_opa(const lv_area_t * coords, const int16_t * ids, int16_t ids_count);
+
+SDL_Texture * lv_draw_sdl_mask_dump_texture(SDL_Renderer * renderer, const lv_area_t * coords, const int16_t * ids,
+                                            int16_t ids_count);
+
+
+/**********************
+ *      MACROS
+ **********************/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SDL_MASK_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_polygon.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_polygon.c
new file mode 100644
index 000000000..c5df50cb9
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_polygon.c
@@ -0,0 +1,133 @@
+/**
+ * @file lv_draw_sdl_polygon.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "lv_draw_sdl.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+static void dump_masks(SDL_Texture * texture, const lv_area_t * coords);
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+void lv_draw_sdl_polygon(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t * points,
+                         uint16_t point_cnt)
+{
+    if(point_cnt < 3) return;
+    if(points == NULL) return;
+
+    lv_draw_mask_polygon_param_t polygon_param;
+    lv_draw_mask_polygon_init(&polygon_param, points, point_cnt);
+
+    if(polygon_param.cfg.point_cnt < 3) {
+        lv_draw_mask_free_param(&polygon_param);
+        return;
+    }
+
+    lv_area_t poly_coords = {.x1 = LV_COORD_MAX, .y1 = LV_COORD_MAX, .x2 = LV_COORD_MIN, .y2 = LV_COORD_MIN};
+
+    uint16_t i;
+    for(i = 0; i < point_cnt; i++) {
+        poly_coords.x1 = LV_MIN(poly_coords.x1, polygon_param.cfg.points[i].x);
+        poly_coords.y1 = LV_MIN(poly_coords.y1, polygon_param.cfg.points[i].y);
+        poly_coords.x2 = LV_MAX(poly_coords.x2, polygon_param.cfg.points[i].x);
+        poly_coords.y2 = LV_MAX(poly_coords.y2, polygon_param.cfg.points[i].y);
+    }
+
+    bool is_common;
+    lv_area_t draw_area;
+    is_common = _lv_area_intersect(&draw_area, &poly_coords, draw_ctx->clip_area);
+    if(!is_common) {
+        lv_draw_mask_free_param(&polygon_param);
+        return;
+    }
+
+    lv_draw_sdl_ctx_t * ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+
+    int16_t mask_id = lv_draw_mask_add(&polygon_param, NULL);
+
+    lv_coord_t w = lv_area_get_width(&draw_area), h = lv_area_get_height(&draw_area);
+    SDL_Texture * texture = lv_draw_sdl_composite_texture_obtain(ctx, LV_DRAW_SDL_COMPOSITE_TEXTURE_ID_STREAM1, w, h);
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    dump_masks(texture, &draw_area);
+
+    lv_draw_mask_remove_id(mask_id);
+    lv_draw_mask_free_param(&polygon_param);
+
+    SDL_Rect srcrect = {0, 0, w, h}, dstrect;
+    lv_area_to_sdl_rect(&draw_area, &dstrect);
+    SDL_Color color;
+    lv_color_to_sdl_color(&draw_dsc->bg_color, &color);
+    SDL_SetTextureColorMod(texture, color.r, color.g, color.b);
+    SDL_SetTextureAlphaMod(texture, draw_dsc->bg_opa);
+    SDL_RenderCopy(ctx->renderer, texture, &srcrect, &dstrect);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void dump_masks(SDL_Texture * texture, const lv_area_t * coords)
+{
+    lv_coord_t w = lv_area_get_width(coords), h = lv_area_get_height(coords);
+    SDL_assert(w > 0 && h > 0);
+    SDL_Rect rect = {0, 0, w, h};
+    uint8_t * pixels;
+    int pitch;
+    if(SDL_LockTexture(texture, &rect, (void **) &pixels, &pitch) != 0) return;
+
+    lv_opa_t * line_buf = lv_mem_buf_get(rect.w);
+    for(lv_coord_t y = 0; y < rect.h; y++) {
+        lv_memset_ff(line_buf, rect.w);
+        lv_coord_t abs_x = (lv_coord_t) coords->x1, abs_y = (lv_coord_t)(y + coords->y1), len = (lv_coord_t) rect.w;
+        lv_draw_mask_res_t res;
+        res = lv_draw_mask_apply(line_buf, abs_x, abs_y, len);
+        if(res == LV_DRAW_MASK_RES_TRANSP) {
+            lv_memset_00(&pixels[y * pitch], 4 * rect.w);
+        }
+        else if(res == LV_DRAW_MASK_RES_FULL_COVER) {
+            lv_memset_ff(&pixels[y * pitch], 4 * rect.w);
+        }
+        else {
+            for(int x = 0; x < rect.w; x++) {
+                uint8_t * pixel = &pixels[y * pitch + x * 4];
+                *pixel = line_buf[x];
+                pixel[1] = pixel[2] = pixel[3] = 0xFF;
+            }
+        }
+    }
+    lv_mem_buf_release(line_buf);
+    SDL_UnlockTexture(texture);
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_sdl.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_priv.h
similarity index 68%
rename from lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_sdl.h
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_priv.h
index d5c22b3fc..1f44c22ac 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_sdl.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_priv.h
@@ -1,10 +1,10 @@
 /**
- * @file lv_gpu_sdl.h
+ * @file lv_draw_sdl_priv.h
  *
  */
 
-#ifndef LV_GPU_SDL_H
-#define LV_GPU_SDL_H
+#ifndef LV_DRAW_SDL_PRIV_H
+#define LV_DRAW_SDL_PRIV_H
 
 
 #ifdef __cplusplus
@@ -14,16 +14,15 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_GPU_SDL
 
-#if LV_USE_EXTERNAL_RENDERER == 0
-#error "SDL GPU requires LV_USE_EXTERNAL_RENDERER 1. Enable it in lv_conf.h"
-#endif
-
 #include LV_GPU_SDL_INCLUDE_PATH
 
+#include "../lv_draw.h"
+#include "../../misc/lv_lru.h"
+
 /*********************
  *      DEFINES
  *********************/
@@ -32,18 +31,16 @@ extern "C" {
  *      TYPEDEFS
  **********************/
 
+typedef struct lv_draw_sdl_context_internals_t {
+    lv_lru_t * texture_cache;
+    SDL_Texture * mask;
+    SDL_Texture * composition;
+} lv_draw_sdl_context_internals_t;
+
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
-void lv_gpu_sdl_init();
-
-/**
- * @brief Free caches
- * 
- */
-void lv_gpu_sdl_deinit();
-
 /*======================
  * Add/remove functions
  *=====================*/
@@ -70,4 +67,4 @@ void lv_gpu_sdl_deinit();
 } /*extern "C"*/
 #endif
 
-#endif /*LV_GPU_SDL_H*/
+#endif /*LV_DRAW_SDL_PRIV_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_rect.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_rect.c
new file mode 100644
index 000000000..4df113efb
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_rect.c
@@ -0,0 +1,708 @@
+/**
+ * @file lv_draw_sdl_rect.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include "../lv_draw_rect.h"
+#include "../lv_draw_img.h"
+#include "../lv_draw_label.h"
+#include "../lv_draw_mask.h"
+#include "../../core/lv_refr.h"
+#include "lv_draw_sdl_utils.h"
+#include "lv_draw_sdl_texture_cache.h"
+#include "lv_draw_sdl_composite.h"
+#include "lv_draw_sdl_mask.h"
+#include "lv_draw_sdl_stack_blur.h"
+#include "lv_draw_sdl_img.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    lv_coord_t radius;
+    lv_coord_t size;
+} lv_draw_rect_bg_key_t;
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    lv_coord_t radius;
+    lv_coord_t size;
+    lv_coord_t blur;
+} lv_draw_rect_shadow_key_t;
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    lv_coord_t rout, rin;
+    lv_area_t offsets;
+} lv_draw_rect_border_key_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static void draw_bg_color(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                          const lv_draw_rect_dsc_t * dsc);
+
+static void draw_bg_img(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                        const lv_draw_rect_dsc_t * dsc);
+
+static void draw_border(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                        const lv_draw_rect_dsc_t * dsc);
+
+static void draw_shadow(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * clip,
+                        const lv_draw_rect_dsc_t * dsc);
+
+static void draw_outline(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * clip,
+                         const lv_draw_rect_dsc_t * dsc);
+
+static void draw_border_generic(lv_draw_sdl_ctx_t * ctx, const lv_area_t * outer_area, const lv_area_t * inner_area,
+                                const lv_area_t * clip, lv_coord_t rout, lv_coord_t rin, lv_color_t color, lv_opa_t opa,
+                                lv_blend_mode_t blend_mode);
+
+static void frag_render_borders(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
+                                const lv_area_t * coords, const lv_area_t * clipped, bool full);
+
+static void frag_render_center(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
+                               const lv_area_t * coords, const lv_area_t * clipped, bool full);
+
+static lv_draw_rect_bg_key_t rect_bg_key_create(lv_coord_t radius, lv_coord_t size);
+
+static lv_draw_rect_shadow_key_t rect_shadow_key_create(lv_coord_t radius, lv_coord_t size, lv_coord_t blur);
+
+static lv_draw_rect_border_key_t rect_border_key_create(lv_coord_t rout, lv_coord_t rin, const lv_area_t * outer_area,
+                                                        const lv_area_t * inner_area);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+#define SKIP_BORDER(dsc) ((dsc)->border_opa <= LV_OPA_MIN || (dsc)->border_width == 0 || (dsc)->border_side == LV_BORDER_SIDE_NONE || (dsc)->border_post)
+#define SKIP_SHADOW(dsc) ((dsc)->shadow_width == 0 || (dsc)->shadow_opa <= LV_OPA_MIN || ((dsc)->shadow_width == 1 && (dsc)->shadow_spread <= 0 && (dsc)->shadow_ofs_x == 0 && (dsc)->shadow_ofs_y == 0))
+#define SKIP_IMAGE(dsc) ((dsc)->bg_img_src == NULL || (dsc)->bg_img_opa <= LV_OPA_MIN)
+#define SKIP_OUTLINE(dsc) ((dsc)->outline_opa <= LV_OPA_MIN || (dsc)->outline_width == 0)
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sdl_draw_rect(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+    const lv_area_t * clip = draw_ctx->clip_area;
+    lv_draw_sdl_ctx_t * ctx = (lv_draw_sdl_ctx_t *) draw_ctx;
+
+    lv_area_t extension = {0, 0, 0, 0};
+    if(!SKIP_SHADOW(dsc)) {
+        lv_coord_t ext = (lv_coord_t)(dsc->shadow_spread - dsc->shadow_width / 2 + 1);
+        extension.x1 = LV_MAX(extension.x1, -dsc->shadow_ofs_x + ext);
+        extension.x2 = LV_MAX(extension.x2, dsc->shadow_ofs_x + ext);
+        extension.y1 = LV_MAX(extension.y1, -dsc->shadow_ofs_y + ext);
+        extension.y2 = LV_MAX(extension.y2, dsc->shadow_ofs_y + ext);
+    }
+    if(!SKIP_OUTLINE(dsc)) {
+        lv_coord_t ext = (lv_coord_t)(dsc->outline_pad - 1 + dsc->outline_width);
+        extension.x1 = LV_MAX(extension.x1, ext);
+        extension.x2 = LV_MAX(extension.x2, ext);
+        extension.y1 = LV_MAX(extension.y1, ext);
+        extension.y2 = LV_MAX(extension.y2, ext);
+    }
+    /* Coords will be translated so coords will start at (0,0) */
+    lv_area_t t_coords = *coords, t_clip = *clip, apply_area, t_area;
+    lv_draw_sdl_composite_begin(ctx, coords, clip, &extension, dsc->blend_mode, &t_coords, &t_clip, &apply_area);
+    bool has_content = _lv_area_intersect(&t_area, &t_coords, &t_clip);
+
+    SDL_Rect clip_rect;
+    lv_area_to_sdl_rect(&t_clip, &clip_rect);
+    draw_shadow(ctx, &t_coords, &t_clip, dsc);
+    /* Shadows and outlines will also draw in extended area */
+    if(has_content) {
+        draw_bg_color(ctx, &t_coords, &t_area, dsc);
+        draw_bg_img(ctx, &t_coords, &t_area, dsc);
+        draw_border(ctx, &t_coords, &t_area, dsc);
+    }
+    draw_outline(ctx, &t_coords, &t_clip, dsc);
+
+    lv_draw_sdl_composite_end(ctx, &apply_area, dsc->blend_mode);
+}
+
+SDL_Texture * lv_draw_sdl_rect_bg_frag_obtain(lv_draw_sdl_ctx_t * ctx, lv_coord_t radius)
+{
+    lv_draw_rect_bg_key_t key = rect_bg_key_create(radius, radius);
+    lv_area_t coords = {0, 0, radius * 2 - 1, radius * 2 - 1};
+    lv_area_t coords_frag = {0, 0, radius - 1, radius - 1};
+    SDL_Texture * texture = lv_draw_sdl_texture_cache_get(ctx, &key, sizeof(key), NULL);
+    if(texture == NULL) {
+        lv_draw_mask_radius_param_t mask_rout_param;
+        lv_draw_mask_radius_init(&mask_rout_param, &coords, radius, false);
+        int16_t mask_id = lv_draw_mask_add(&mask_rout_param, NULL);
+        texture = lv_draw_sdl_mask_dump_texture(ctx->renderer, &coords_frag, &mask_id, 1);
+        lv_draw_mask_remove_id(mask_id);
+        SDL_assert(texture);
+        lv_draw_sdl_texture_cache_put(ctx, &key, sizeof(key), texture);
+    }
+    return texture;
+}
+
+void lv_draw_sdl_rect_bg_frag_draw_corners(lv_draw_sdl_ctx_t * ctx, SDL_Texture * frag, lv_coord_t frag_size,
+                                           const lv_area_t * coords, const lv_area_t * clip, bool full)
+{
+    if(!clip) clip = coords;
+    lv_area_t corner_area, dst_area;
+    /* Upper left */
+    corner_area.x1 = coords->x1;
+    corner_area.y1 = coords->y1;
+    corner_area.x2 = coords->x1 + frag_size - 1;
+    corner_area.y2 = coords->y1 + frag_size - 1;
+    if(_lv_area_intersect(&dst_area, &corner_area, clip)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dw = lv_area_get_width(&dst_area), dh = lv_area_get_height(&dst_area);
+        lv_coord_t sx = (lv_coord_t)(dst_area.x1 - corner_area.x1), sy = (lv_coord_t)(dst_area.y1 - corner_area.y1);
+        SDL_Rect src_rect = {sx, sy, dw, dh};
+        SDL_RenderCopy(ctx->renderer, frag, &src_rect, &dst_rect);
+    }
+    /* Upper right, clip right edge if too big */
+    corner_area.x1 = LV_MAX(coords->x2 - frag_size + 1, coords->x1 + frag_size);
+    corner_area.x2 = coords->x2;
+    if(_lv_area_intersect(&dst_area, &corner_area, clip)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dw = lv_area_get_width(&dst_area), dh = lv_area_get_height(&dst_area);
+        if(full) {
+            lv_coord_t sx = (lv_coord_t)(dst_area.x1 - corner_area.x1),
+                       sy = (lv_coord_t)(dst_area.y1 - corner_area.y1);
+            SDL_Rect src_rect = {frag_size + 3 + sx, sy, dw, dh};
+            SDL_RenderCopy(ctx->renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            SDL_Rect src_rect = {corner_area.x2 - dst_area.x2, dst_area.y1 - corner_area.y1, dw, dh};
+            SDL_RenderCopyEx(ctx->renderer, frag, &src_rect, &dst_rect, 0, NULL, SDL_FLIP_HORIZONTAL);
+        }
+    }
+    /* Lower right, clip bottom edge if too big */
+    corner_area.y1 = LV_MAX(coords->y2 - frag_size + 1, coords->y1 + frag_size);
+    corner_area.y2 = coords->y2;
+    if(_lv_area_intersect(&dst_area, &corner_area, clip)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dw = lv_area_get_width(&dst_area), dh = lv_area_get_height(&dst_area);
+        if(full) {
+            lv_coord_t sx = (lv_coord_t)(dst_area.x1 - corner_area.x1),
+                       sy = (lv_coord_t)(dst_area.y1 - corner_area.y1);
+            SDL_Rect src_rect = {frag_size + 3 + sx, frag_size + 3 + sy, dw, dh};
+            SDL_RenderCopy(ctx->renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            SDL_Rect src_rect = {corner_area.x2 - dst_area.x2, corner_area.y2 - dst_area.y2, dw, dh};
+            SDL_RenderCopyEx(ctx->renderer, frag, &src_rect, &dst_rect, 0, NULL, SDL_FLIP_HORIZONTAL | SDL_FLIP_VERTICAL);
+        }
+    }
+    /* Lower left, right edge should not be clip */
+    corner_area.x1 = coords->x1;
+    corner_area.x2 = coords->x1 + frag_size - 1;
+    if(_lv_area_intersect(&dst_area, &corner_area, clip)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dw = lv_area_get_width(&dst_area), dh = lv_area_get_height(&dst_area);
+        if(full) {
+            lv_coord_t sx = (lv_coord_t)(dst_area.x1 - corner_area.x1),
+                       sy = (lv_coord_t)(dst_area.y1 - corner_area.y1);
+            SDL_Rect src_rect = {sx, frag_size + 3 + sy, dw, dh};
+            SDL_RenderCopy(ctx->renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            SDL_Rect src_rect = {dst_area.x1 - corner_area.x1, corner_area.y2 - dst_area.y2, dw, dh};
+            SDL_RenderCopyEx(ctx->renderer, frag, &src_rect, &dst_rect, 0, NULL, SDL_FLIP_VERTICAL);
+        }
+    }
+}
+
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void draw_bg_color(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                          const lv_draw_rect_dsc_t * dsc)
+{
+    if(dsc->bg_opa == 0) {
+        return;
+    }
+    SDL_Color bg_color;
+    lv_color_to_sdl_color(&dsc->bg_color, &bg_color);
+    lv_coord_t radius = dsc->radius;
+    if(radius <= 0) {
+        SDL_Rect rect;
+        lv_area_to_sdl_rect(draw_area, &rect);
+        SDL_SetRenderDrawColor(ctx->renderer, bg_color.r, bg_color.g, bg_color.b, dsc->bg_opa);
+        SDL_SetRenderDrawBlendMode(ctx->renderer, SDL_BLENDMODE_BLEND);
+        SDL_RenderFillRect(ctx->renderer, &rect);
+        return;
+    }
+
+    /*A small texture with a quarter of the rect is enough*/
+    lv_coord_t bg_w = lv_area_get_width(coords), bg_h = lv_area_get_height(coords);
+    lv_coord_t real_radius = LV_MIN3(bg_w / 2, bg_h / 2, radius);
+    SDL_Texture * texture = lv_draw_sdl_rect_bg_frag_obtain(ctx, real_radius);
+
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    SDL_SetTextureAlphaMod(texture, dsc->bg_opa);
+    SDL_SetTextureColorMod(texture, bg_color.r, bg_color.g, bg_color.b);
+    lv_draw_sdl_rect_bg_frag_draw_corners(ctx, texture, real_radius, coords, draw_area, false);
+    frag_render_borders(ctx->renderer, texture, real_radius, coords, draw_area, false);
+    frag_render_center(ctx->renderer, texture, real_radius, coords, draw_area, false);
+}
+
+static void draw_bg_img(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                        const lv_draw_rect_dsc_t * dsc)
+{
+    if(SKIP_IMAGE(dsc)) return;
+
+    lv_img_src_t src_type = lv_img_src_get_type(dsc->bg_img_src);
+    if(src_type == LV_IMG_SRC_SYMBOL) {
+        lv_point_t size;
+        lv_txt_get_size(&size, dsc->bg_img_src, dsc->bg_img_symbol_font, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE);
+        lv_area_t a;
+        a.x1 = coords->x1 + lv_area_get_width(coords) / 2 - size.x / 2;
+        a.x2 = a.x1 + size.x - 1;
+        a.y1 = coords->y1 + lv_area_get_height(coords) / 2 - size.y / 2;
+        a.y2 = a.y1 + size.y - 1;
+
+        lv_draw_label_dsc_t label_draw_dsc;
+        lv_draw_label_dsc_init(&label_draw_dsc);
+        label_draw_dsc.font = dsc->bg_img_symbol_font;
+        label_draw_dsc.color = dsc->bg_img_recolor;
+        label_draw_dsc.opa = dsc->bg_img_opa;
+        lv_draw_label((lv_draw_ctx_t *) ctx, &label_draw_dsc, &a, dsc->bg_img_src, NULL);
+    }
+    else {
+        lv_img_header_t header;
+        size_t key_size;
+        lv_draw_sdl_cache_key_head_img_t * key = lv_draw_sdl_texture_img_key_create(dsc->bg_img_src, 0, &key_size);
+        bool key_found;
+        lv_img_header_t * cache_header = NULL;
+        SDL_Texture * texture = lv_draw_sdl_texture_cache_get_with_userdata(ctx, key, key_size, &key_found,
+                                                                            (void **) &cache_header);
+        SDL_free(key);
+        if(texture) {
+            header = *cache_header;
+        }
+        else if(key_found || lv_img_decoder_get_info(dsc->bg_img_src, &header) != LV_RES_OK) {
+            /* When cache hit but with negative result, use default decoder. If still fail, return.*/
+            LV_LOG_WARN("Couldn't read the background image");
+            return;
+        }
+
+        lv_draw_img_dsc_t img_dsc;
+        lv_draw_img_dsc_init(&img_dsc);
+        img_dsc.blend_mode = dsc->blend_mode;
+        img_dsc.recolor = dsc->bg_img_recolor;
+        img_dsc.recolor_opa = dsc->bg_img_recolor_opa;
+        img_dsc.opa = dsc->bg_img_opa;
+        img_dsc.frame_id = 0;
+
+        int16_t radius_mask_id = LV_MASK_ID_INV;
+        lv_draw_mask_radius_param_t radius_param;
+        if(dsc->radius > 0) {
+            lv_draw_mask_radius_init(&radius_param, coords, dsc->radius, false);
+            radius_mask_id = lv_draw_mask_add(&radius_param, NULL);
+        }
+
+        /*Center align*/
+        if(dsc->bg_img_tiled == false) {
+            lv_area_t area;
+            area.x1 = coords->x1 + lv_area_get_width(coords) / 2 - header.w / 2;
+            area.y1 = coords->y1 + lv_area_get_height(coords) / 2 - header.h / 2;
+            area.x2 = area.x1 + header.w - 1;
+            area.y2 = area.y1 + header.h - 1;
+
+            lv_draw_img((lv_draw_ctx_t *) ctx, &img_dsc, &area, dsc->bg_img_src);
+        }
+        else {
+            lv_area_t area;
+            area.y1 = coords->y1;
+            area.y2 = area.y1 + header.h - 1;
+
+            for(; area.y1 <= coords->y2; area.y1 += header.h, area.y2 += header.h) {
+
+                area.x1 = coords->x1;
+                area.x2 = area.x1 + header.w - 1;
+                for(; area.x1 <= coords->x2; area.x1 += header.w, area.x2 += header.w) {
+                    lv_draw_img((lv_draw_ctx_t *) ctx, &img_dsc, &area, dsc->bg_img_src);
+                }
+            }
+        }
+
+        if(radius_mask_id != LV_MASK_ID_INV) {
+            lv_draw_mask_remove_id(radius_mask_id);
+            lv_draw_mask_free_param(&radius_param);
+        }
+    }
+}
+
+static void draw_shadow(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * clip,
+                        const lv_draw_rect_dsc_t * dsc)
+{
+    /*Check whether the shadow is visible*/
+    if(SKIP_SHADOW(dsc)) return;
+
+    lv_coord_t sw = dsc->shadow_width;
+
+    lv_area_t core_area;
+    core_area.x1 = coords->x1 + dsc->shadow_ofs_x - dsc->shadow_spread;
+    core_area.x2 = coords->x2 + dsc->shadow_ofs_x + dsc->shadow_spread;
+    core_area.y1 = coords->y1 + dsc->shadow_ofs_y - dsc->shadow_spread;
+    core_area.y2 = coords->y2 + dsc->shadow_ofs_y + dsc->shadow_spread;
+
+    lv_area_t shadow_area;
+    shadow_area.x1 = core_area.x1 - sw / 2 - 1;
+    shadow_area.x2 = core_area.x2 + sw / 2 + 1;
+    shadow_area.y1 = core_area.y1 - sw / 2 - 1;
+    shadow_area.y2 = core_area.y2 + sw / 2 + 1;
+
+    lv_opa_t opa = dsc->shadow_opa;
+
+    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
+
+    /*Get clipped draw area which is the real draw area.
+     *It is always the same or inside `shadow_area`*/
+    lv_area_t draw_area;
+    if(!_lv_area_intersect(&draw_area, &shadow_area, clip)) return;
+
+    SDL_Rect core_area_rect;
+    lv_area_to_sdl_rect(&shadow_area, &core_area_rect);
+
+    lv_coord_t radius = dsc->radius;
+    /* No matter how big the shadow is, what we need is just a corner */
+    lv_coord_t frag_size = LV_MIN3(lv_area_get_width(&core_area) / 2, lv_area_get_height(&core_area) / 2,
+                                   LV_MAX(sw / 2, radius));
+
+    /* This is how big the corner is after blurring */
+    lv_coord_t blur_growth = (lv_coord_t)(sw / 2 + 1);
+
+    lv_coord_t blur_frag_size = (lv_coord_t)(frag_size + blur_growth);
+
+    lv_draw_rect_shadow_key_t key = rect_shadow_key_create(radius, frag_size, sw);
+
+    SDL_Texture * texture = lv_draw_sdl_texture_cache_get(ctx, &key, sizeof(key), NULL);
+    if(texture == NULL) {
+        lv_area_t mask_area = {blur_growth, blur_growth}, mask_area_blurred = {0, 0};
+        lv_area_set_width(&mask_area, frag_size * 2);
+        lv_area_set_height(&mask_area, frag_size * 2);
+        lv_area_set_width(&mask_area_blurred, blur_frag_size * 2);
+        lv_area_set_height(&mask_area_blurred, blur_frag_size * 2);
+
+        lv_draw_mask_radius_param_t mask_rout_param;
+        lv_draw_mask_radius_init(&mask_rout_param, &mask_area, radius, false);
+        int16_t mask_id = lv_draw_mask_add(&mask_rout_param, NULL);
+        lv_opa_t * mask_buf = lv_draw_sdl_mask_dump_opa(&mask_area_blurred, &mask_id, 1);
+        lv_stack_blur_grayscale(mask_buf, lv_area_get_width(&mask_area_blurred), lv_area_get_height(&mask_area_blurred),
+                                sw / 2 + sw % 2);
+        texture = lv_sdl_create_opa_texture(ctx->renderer, mask_buf, blur_frag_size, blur_frag_size,
+                                            lv_area_get_width(&mask_area_blurred));
+        lv_mem_buf_release(mask_buf);
+        lv_draw_mask_remove_id(mask_id);
+        SDL_assert(texture);
+        lv_draw_sdl_texture_cache_put(ctx, &key, sizeof(key), texture);
+    }
+
+    SDL_Color shadow_color;
+    lv_color_to_sdl_color(&dsc->shadow_color, &shadow_color);
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    SDL_SetTextureAlphaMod(texture, opa);
+    SDL_SetTextureColorMod(texture, shadow_color.r, shadow_color.g, shadow_color.b);
+
+    lv_draw_sdl_rect_bg_frag_draw_corners(ctx, texture, blur_frag_size, &shadow_area, clip, false);
+    frag_render_borders(ctx->renderer, texture, blur_frag_size, &shadow_area, clip, false);
+    frag_render_center(ctx->renderer, texture, blur_frag_size, &shadow_area, clip, false);
+}
+
+
+static void draw_border(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * draw_area,
+                        const lv_draw_rect_dsc_t * dsc)
+{
+    if(SKIP_BORDER(dsc)) return;
+
+    SDL_Color border_color;
+    lv_color_to_sdl_color(&dsc->border_color, &border_color);
+
+    lv_coord_t coords_w = lv_area_get_width(coords), coords_h = lv_area_get_height(coords);
+    lv_coord_t short_side = LV_MIN(coords_w, coords_h);
+    lv_coord_t rout = LV_MIN(dsc->radius, short_side / 2);/*Get the inner area*/
+    lv_area_t area_inner;
+    lv_area_copy(&area_inner, coords);//        lv_area_increase(&area_inner, 1, 1);
+    area_inner.x1 += ((dsc->border_side & LV_BORDER_SIDE_LEFT) ? dsc->border_width : -(dsc->border_width + rout));
+    area_inner.x2 -= ((dsc->border_side & LV_BORDER_SIDE_RIGHT) ? dsc->border_width : -(dsc->border_width + rout));
+    area_inner.y1 += ((dsc->border_side & LV_BORDER_SIDE_TOP) ? dsc->border_width : -(dsc->border_width + rout));
+    area_inner.y2 -= ((dsc->border_side & LV_BORDER_SIDE_BOTTOM) ? dsc->border_width : -(dsc->border_width + rout));
+    lv_coord_t rin = LV_MAX(rout - dsc->border_width, 0);
+    draw_border_generic(ctx, coords, &area_inner, draw_area, rout, rin, dsc->border_color, dsc->border_opa,
+                        dsc->blend_mode);
+}
+
+static void draw_outline(lv_draw_sdl_ctx_t * ctx, const lv_area_t * coords, const lv_area_t * clip,
+                         const lv_draw_rect_dsc_t * dsc)
+{
+    if(SKIP_OUTLINE(dsc)) return;
+
+    lv_opa_t opa = dsc->outline_opa;
+
+    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
+
+    /*Get the inner radius*/
+    lv_area_t area_inner;
+    lv_area_copy(&area_inner, coords);
+
+    /*Bring the outline closer to make sure there is no color bleeding with pad=0*/
+    lv_coord_t pad = dsc->outline_pad - 1;
+    area_inner.x1 -= pad;
+    area_inner.y1 -= pad;
+    area_inner.x2 += pad;
+    area_inner.y2 += pad;
+
+    lv_area_t area_outer;
+    lv_area_copy(&area_outer, &area_inner);
+
+    area_outer.x1 -= dsc->outline_width;
+    area_outer.x2 += dsc->outline_width;
+    area_outer.y1 -= dsc->outline_width;
+    area_outer.y2 += dsc->outline_width;
+
+    lv_area_t draw_area;
+    if(!_lv_area_intersect(&draw_area, &area_outer, clip)) return;
+
+    int32_t inner_w = lv_area_get_width(&area_inner);
+    int32_t inner_h = lv_area_get_height(&area_inner);
+    lv_coord_t rin = dsc->radius;
+    int32_t short_side = LV_MIN(inner_w, inner_h);
+    if(rin > short_side >> 1) rin = short_side >> 1;
+
+    lv_coord_t rout = rin + dsc->outline_width;
+
+    draw_border_generic(ctx, &area_outer, &area_inner, clip, rout, rin, dsc->outline_color, dsc->outline_opa,
+                        dsc->blend_mode);
+}
+
+static void draw_border_generic(lv_draw_sdl_ctx_t * ctx, const lv_area_t * outer_area, const lv_area_t * inner_area,
+                                const lv_area_t * clip, lv_coord_t rout, lv_coord_t rin, lv_color_t color, lv_opa_t opa,
+                                lv_blend_mode_t blend_mode)
+{
+    opa = opa >= LV_OPA_COVER ? LV_OPA_COVER : opa;
+
+    SDL_Renderer * renderer = ctx->renderer;
+
+    lv_draw_rect_border_key_t key = rect_border_key_create(rout, rin, outer_area, inner_area);
+    lv_coord_t radius = LV_MIN3(rout, lv_area_get_width(outer_area) / 2, lv_area_get_height(outer_area) / 2);
+    lv_coord_t max_side = LV_MAX4(key.offsets.x1, key.offsets.y1, -key.offsets.x2, -key.offsets.y2);
+    lv_coord_t frag_size = LV_MAX(radius, max_side);
+    SDL_Texture * texture = lv_draw_sdl_texture_cache_get(ctx, &key, sizeof(key), NULL);
+    if(texture == NULL) {
+        /* Create a mask texture with size of (frag_size * 2 + 3) */
+        const lv_area_t frag_area = {0, 0, frag_size * 2 + 2, frag_size * 2 + 2};
+
+        /*Create mask for the outer area*/
+        int16_t mask_ids[2] = {LV_MASK_ID_INV, LV_MASK_ID_INV};
+        lv_draw_mask_radius_param_t mask_rout_param;
+        if(rout > 0) {
+            lv_draw_mask_radius_init(&mask_rout_param, &frag_area, rout, false);
+            mask_ids[0] = lv_draw_mask_add(&mask_rout_param, NULL);
+        }
+
+        /*Create mask for the inner mask*/
+        if(rin < 0) rin = 0;
+        const lv_area_t frag_inner_area = {frag_area.x1 + key.offsets.x1, frag_area.y1 + key.offsets.y1,
+                                           frag_area.x2 + key.offsets.x2, frag_area.y2 + key.offsets.y2
+                                          };
+        lv_draw_mask_radius_param_t mask_rin_param;
+        lv_draw_mask_radius_init(&mask_rin_param, &frag_inner_area, rin, true);
+        mask_ids[1] = lv_draw_mask_add(&mask_rin_param, NULL);
+
+        texture = lv_draw_sdl_mask_dump_texture(renderer, &frag_area, mask_ids, 2);
+
+        lv_draw_mask_remove_id(mask_ids[1]);
+        lv_draw_mask_remove_id(mask_ids[0]);
+        SDL_assert(texture);
+        lv_draw_sdl_texture_cache_put(ctx, &key, sizeof(key), texture);
+    }
+
+    SDL_Rect outer_rect;
+    lv_area_to_sdl_rect(outer_area, &outer_rect);
+    SDL_Color color_sdl;
+    lv_color_to_sdl_color(&color, &color_sdl);
+
+    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+    SDL_SetTextureAlphaMod(texture, opa);
+    SDL_SetTextureColorMod(texture, color_sdl.r, color_sdl.g, color_sdl.b);
+
+    lv_draw_sdl_rect_bg_frag_draw_corners(ctx, texture, frag_size, outer_area, clip, true);
+    frag_render_borders(renderer, texture, frag_size, outer_area, clip, true);
+}
+
+static void frag_render_borders(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
+                                const lv_area_t * coords, const lv_area_t * clipped, bool full)
+{
+    lv_area_t border_area, dst_area;
+    /* Top border */
+    border_area.x1 = coords->x1 + frag_size;
+    border_area.y1 = coords->y1;
+    border_area.x2 = coords->x2 - frag_size;
+    border_area.y2 = coords->y1 + frag_size - 1;
+    if(_lv_area_intersect(&dst_area, &border_area, clipped)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t sy = (lv_coord_t)(dst_area.y1 - border_area.y1);
+        if(full) {
+            SDL_Rect src_rect = {frag_size + 1, sy, 1, lv_area_get_height(&dst_area)};
+            SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            SDL_Rect src_rect = {frag_size - 1, sy, 1, lv_area_get_height(&dst_area)};
+            SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+        }
+    }
+    /* Bottom border */
+    border_area.y1 = LV_MAX(coords->y2 - frag_size + 1, coords->y1 + frag_size);
+    border_area.y2 = coords->y2;
+    if(_lv_area_intersect(&dst_area, &border_area, clipped)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dh = lv_area_get_height(&dst_area);
+        if(full) {
+            lv_coord_t sy = (lv_coord_t)(dst_area.y1 - border_area.y1);
+            SDL_Rect src_rect = {frag_size + 1, frag_size + 3 + sy, 1, dh};
+            SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            lv_coord_t sy = (lv_coord_t)(border_area.y2 - dst_area.y2);
+            SDL_Rect src_rect = {frag_size - 1, sy, 1, dh};
+            SDL_RenderCopyEx(renderer, frag, &src_rect, &dst_rect, 0, NULL, SDL_FLIP_VERTICAL);
+        }
+    }
+    /* Left border */
+    border_area.x1 = coords->x1;
+    border_area.y1 = coords->y1 + frag_size;
+    border_area.x2 = coords->x1 + frag_size - 1;
+    border_area.y2 = coords->y2 - frag_size;
+    if(_lv_area_intersect(&dst_area, &border_area, clipped)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dw = lv_area_get_width(&dst_area);
+        lv_coord_t sx = (lv_coord_t)(dst_area.x1 - border_area.x1);
+        if(full) {
+            SDL_Rect src_rect = {sx, frag_size + 1, dw, 1};
+            SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            SDL_Rect src_rect = {sx, frag_size - 1, dw, 1};
+            SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+        }
+    }
+    /* Right border */
+    border_area.x1 = LV_MAX(coords->x2 - frag_size + 1, coords->x1 + frag_size);
+    border_area.x2 = coords->x2;
+    if(_lv_area_intersect(&dst_area, &border_area, clipped)) {
+        SDL_Rect dst_rect;
+        lv_area_to_sdl_rect(&dst_area, &dst_rect);
+
+        lv_coord_t dw = lv_area_get_width(&dst_area);
+        if(full) {
+            lv_coord_t sx = (lv_coord_t)(dst_area.x1 - border_area.x1);
+            SDL_Rect src_rect = {frag_size + 3 + sx, frag_size + 1, dw, 1};
+            SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+        }
+        else {
+            lv_coord_t sx = (lv_coord_t)(border_area.x2 - dst_area.x2);
+            SDL_Rect src_rect = {sx, frag_size - 1, dw, 1};
+            SDL_RenderCopyEx(renderer, frag, &src_rect, &dst_rect, 0, NULL, SDL_FLIP_HORIZONTAL);
+        }
+    }
+}
+
+static void frag_render_center(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
+                               const lv_area_t * coords,
+                               const lv_area_t * clipped, bool full)
+{
+    lv_area_t center_area = {
+        coords->x1 + frag_size,
+        coords->y1 + frag_size,
+        coords->x2 - frag_size,
+        coords->y2 - frag_size,
+    };
+    if(center_area.x2 < center_area.x1 || center_area.y2 < center_area.y1) return;
+    lv_area_t draw_area;
+    if(!_lv_area_intersect(&draw_area, &center_area, clipped)) {
+        return;
+    }
+    SDL_Rect dst_rect;
+    lv_area_to_sdl_rect(&draw_area, &dst_rect);
+    if(full) {
+        SDL_Rect src_rect = {frag_size, frag_size, 1, 1};
+        SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+    }
+    else {
+        SDL_Rect src_rect = {frag_size - 1, frag_size - 1, 1, 1};
+        SDL_RenderCopy(renderer, frag, &src_rect, &dst_rect);
+    }
+}
+
+static lv_draw_rect_bg_key_t rect_bg_key_create(lv_coord_t radius, lv_coord_t size)
+{
+    lv_draw_rect_bg_key_t key;
+    SDL_memset(&key, 0, sizeof(key));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_RECT_BG;
+    key.radius = radius;
+    key.size = size;
+    return key;
+}
+
+static lv_draw_rect_shadow_key_t rect_shadow_key_create(lv_coord_t radius, lv_coord_t size, lv_coord_t blur)
+{
+    lv_draw_rect_shadow_key_t key;
+    SDL_memset(&key, 0, sizeof(key));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_RECT_SHADOW;
+    key.radius = radius;
+    key.size = size;
+    key.blur = blur;
+    return key;
+}
+
+static lv_draw_rect_border_key_t rect_border_key_create(lv_coord_t rout, lv_coord_t rin, const lv_area_t * outer_area,
+                                                        const lv_area_t * inner_area)
+{
+    lv_draw_rect_border_key_t key;
+    /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
+    SDL_memset(&key, 0, sizeof(key));
+    key.magic = LV_GPU_CACHE_KEY_MAGIC_RECT_BORDER;
+    key.rout = rout;
+    key.rin = rin;
+    key.offsets.x1 = inner_area->x1 - outer_area->x1;
+    key.offsets.x2 = inner_area->x2 - outer_area->x2;
+    key.offsets.y1 = inner_area->y1 - outer_area->y1;
+    key.offsets.y2 = inner_area->y2 - outer_area->y2;
+    return key;
+}
+
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_rect.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_rect.h
new file mode 100644
index 000000000..1e9be3445
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_rect.h
@@ -0,0 +1,75 @@
+/**
+ * @file lv_draw_sdl_rect.h
+ *
+ */
+
+#ifndef LV_DRAW_SDL_RECT_H
+#define LV_DRAW_SDL_RECT_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include LV_GPU_SDL_INCLUDE_PATH
+
+#include "../lv_draw.h"
+
+#include "lv_draw_sdl_texture_cache.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct lv_draw_sdl_rect_header_t {
+    lv_img_header_t base;
+    SDL_Rect rect;
+} lv_draw_sdl_rect_header_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/*======================
+ * Add/remove functions
+ *=====================*/
+
+/*=====================
+ * Setter functions
+ *====================*/
+
+/*=====================
+ * Getter functions
+ *====================*/
+
+/*=====================
+ * Other functions
+ *====================*/
+
+SDL_Texture * lv_draw_sdl_rect_bg_frag_obtain(lv_draw_sdl_ctx_t * ctx, lv_coord_t radius);
+
+void lv_draw_sdl_rect_bg_frag_draw_corners(lv_draw_sdl_ctx_t * ctx, SDL_Texture * frag, lv_coord_t frag_size,
+                                           const lv_area_t * coords, const lv_area_t * clip, bool full);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*LV_USE_GPU_SDL*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SDL_RECT_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_stack_blur.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_stack_blur.c
similarity index 98%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_stack_blur.c
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_stack_blur.c
index 6d68294c9..1c411b0ee 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_stack_blur.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_stack_blur.c
@@ -1,13 +1,14 @@
 /**
- * @file lv_gpu_sdl_stack_blur.c
+ * @file lv_draw_sdl_stack_blur.c
  *
  */
 
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_gpu_sdl_stack_blur.h"
+#include "lv_draw_sdl_stack_blur.h"
 
+#if LV_USE_GPU_SDL
 /*********************
  *      DEFINES
  *********************/
@@ -245,3 +246,4 @@ static void stack_blur_job(lv_opa_t * src, unsigned int w, unsigned int h, unsig
     }
 }
 
+#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_stack_blur.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_stack_blur.h
similarity index 76%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_stack_blur.h
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_stack_blur.h
index 5e13192a1..413b1c949 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_stack_blur.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_stack_blur.h
@@ -1,9 +1,9 @@
 /**
- * @file lv_gpu_sdl_stack_blur.h
+ * @file lv_draw_sdl_stack_blur.h
  *
  */
-#ifndef LV_GPU_SDL_STACK_BLUR_H
-#define LV_GPU_SDL_STACK_BLUR_H
+#ifndef LV_DRAW_SDL_STACK_BLUR_H
+#define LV_DRAW_SDL_STACK_BLUR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,6 +15,8 @@ extern "C" {
 
 #include "../../lv_conf_internal.h"
 
+#if LV_USE_GPU_SDL
+
 #include "../../misc/lv_color.h"
 
 /*********************
@@ -35,8 +37,10 @@ void lv_stack_blur_grayscale(lv_opa_t * buf, uint16_t w, uint16_t h, uint16_t r)
  *      MACROS
  **********************/
 
+#endif /*LV_USE_GPU_SDL*/
+
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
 
-#endif /*LV_GPU_SDL_STACK_BLUR_H*/
+#endif /*LV_DRAW_SDL_STACK_BLUR_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_texture_cache.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_texture_cache.c
similarity index 51%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_texture_cache.c
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_texture_cache.c
index 96f7d2d5a..58ff9f374 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_texture_cache.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_texture_cache.c
@@ -1,5 +1,5 @@
 /**
- * @file lv_gpu_sdl_texture_cache.c
+ * @file lv_draw_sdl_texture_cache.c
  *
  */
 
@@ -11,11 +11,9 @@
 
 #if LV_USE_GPU_SDL
 
-#include "lv_gpu_sdl_texture_cache.h"
+#include "lv_draw_sdl_texture_cache.h"
 
-#include "../../misc/lv_log.h"
-#include "../../draw/lv_draw_label.h"
-#include "../../draw/lv_draw_img.h"
+#include "lv_draw_sdl_utils.h"
 
 /*********************
  *      DEFINES
@@ -29,29 +27,25 @@ typedef struct {
     SDL_Texture * texture;
     void * userdata;
     lv_lru_free_t * userdata_free;
-    lv_gpu_sdl_cache_flag_t flags;
+    lv_draw_sdl_cache_flag_t flags;
 } draw_cache_value_t;
 
 typedef struct {
-    lv_gpu_cache_key_magic_t magic;
+    lv_sdl_cache_key_magic_t magic;
 } temp_texture_key_t;
 
 typedef struct {
     lv_coord_t width, height;
 } temp_texture_userdata_t;
 
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
 static void draw_cache_free_value(draw_cache_value_t *);
 
+static draw_cache_value_t * draw_cache_get_entry(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length,
+                                                 bool * found);
 /**********************
  *  STATIC VARIABLES
  **********************/
 
-static lv_lru_t * lv_sdl_texture_cache;
-
 /**********************
  *      MACROS
  **********************/
@@ -60,64 +54,56 @@ static lv_lru_t * lv_sdl_texture_cache;
  *   GLOBAL FUNCTIONS
  **********************/
 
-void _lv_gpu_sdl_texture_cache_init()
+void lv_draw_sdl_texture_cache_init(lv_draw_sdl_ctx_t * ctx)
 {
-    lv_sdl_texture_cache = lv_lru_new(1024 * 1024 * 8, 65536, (lv_lru_free_t *) draw_cache_free_value,
-                                      NULL);
+    ctx->internals->texture_cache = lv_lru_create(LV_GPU_SDL_LRU_SIZE, 65536,
+                                                  (lv_lru_free_t *) draw_cache_free_value, NULL);
 }
 
-void _lv_gpu_sdl_texture_cache_deinit()
+void lv_draw_sdl_texture_cache_deinit(lv_draw_sdl_ctx_t * ctx)
 {
-    lv_lru_free(lv_sdl_texture_cache);
+    lv_lru_del(ctx->internals->texture_cache);
 }
 
-SDL_Texture * lv_gpu_draw_cache_get(const void * key, size_t key_length, bool * found)
+SDL_Texture * lv_draw_sdl_texture_cache_get(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length, bool * found)
 {
-    return lv_gpu_draw_cache_get_with_userdata(key, key_length, found, NULL);
+    return lv_draw_sdl_texture_cache_get_with_userdata(ctx, key, key_length, found, NULL);
 }
 
-SDL_Texture * lv_gpu_draw_cache_get_with_userdata(const void * key, size_t key_length, bool * found, void ** userdata)
+SDL_Texture * lv_draw_sdl_texture_cache_get_with_userdata(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length,
+                                                          bool * found, void ** userdata)
 {
-    draw_cache_value_t * value = NULL;
-    lv_lru_get(lv_sdl_texture_cache, key, key_length, (void **) &value);
-    if(!value) {
-        if(found) {
-            *found = false;
-        }
-        return NULL;
-    }
-    else {
-        if(userdata) {
-            *userdata = value->userdata;
-        }
-    }
-    if(found) {
-        *found = true;
+    draw_cache_value_t * value = draw_cache_get_entry(ctx, key, key_length, found);
+    if(!value) return NULL;
+    if(userdata) {
+        *userdata = value->userdata;
     }
     return value->texture;
 }
 
-void lv_gpu_draw_cache_put(const void * key, size_t key_length, SDL_Texture * texture)
+void lv_draw_sdl_texture_cache_put(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length, SDL_Texture * texture)
 {
-    lv_gpu_draw_cache_put_advanced(key, key_length, texture, NULL, NULL, 0);
+    lv_draw_sdl_texture_cache_put_advanced(ctx, key, key_length, texture, NULL, NULL, 0);
 }
 
-void lv_gpu_draw_cache_put_advanced(const void * key, size_t key_length, SDL_Texture * texture, void * userdata,
-                                    lv_lru_free_t userdata_free, lv_gpu_sdl_cache_flag_t flags)
+void lv_draw_sdl_texture_cache_put_advanced(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length,
+                                            SDL_Texture * texture, void * userdata, void userdata_free(void *),
+                                            lv_draw_sdl_cache_flag_t flags)
 {
+    lv_lru_t * lru = ctx->internals->texture_cache;
     draw_cache_value_t * value = SDL_malloc(sizeof(draw_cache_value_t));
     value->texture = texture;
     value->userdata = userdata;
     value->userdata_free = userdata_free;
     value->flags = flags;
     if(!texture) {
-        lv_lru_set(lv_sdl_texture_cache, key, key_length, value, 1);
+        lv_lru_set(lru, key, key_length, value, 1);
         return;
     }
-    if(flags & LV_GPU_SDL_CACHE_FLAG_MANAGED) {
+    if(flags & LV_DRAW_SDL_CACHE_FLAG_MANAGED) {
         /* Managed texture doesn't count into cache size */
         LV_LOG_INFO("cache texture %p, %d*%d@%dbpp", texture, width, height, SDL_BITSPERPIXEL(format));
-        lv_lru_set(lv_sdl_texture_cache, key, key_length, value, 1);
+        lv_lru_set(lru, key, key_length, value, 1);
         return;
     }
     Uint32 format;
@@ -126,30 +112,12 @@ void lv_gpu_draw_cache_put_advanced(const void * key, size_t key_length, SDL_Tex
         return;
     }
     LV_LOG_INFO("cache texture %p, %d*%d@%dbpp", texture, width, height, SDL_BITSPERPIXEL(format));
-    lv_lru_set(lv_sdl_texture_cache, key, key_length, value, width * height * SDL_BITSPERPIXEL(format) / 8);
+    lv_lru_set(lru, key, key_length, value, width * height * SDL_BITSPERPIXEL(format) / 8);
 }
 
-SDL_Texture * lv_gpu_temp_texture_obtain(SDL_Renderer * renderer, lv_coord_t width, lv_coord_t height)
+lv_draw_sdl_cache_key_head_img_t * lv_draw_sdl_texture_img_key_create(const void * src, int32_t frame_id, size_t * size)
 {
-    temp_texture_key_t key;
-    SDL_memset(&key, 0, sizeof(key));
-    key.magic = LV_GPU_CACHE_KEY_TEMP;
-    temp_texture_userdata_t * userdata = NULL;
-    SDL_Texture * texture = lv_gpu_draw_cache_get_with_userdata(&key, sizeof(key), NULL, (void **) &userdata);
-    if(texture && userdata->width >= width && userdata->height >= height) {
-        return texture;
-    }
-    texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_TARGET, width, height);
-    userdata = SDL_malloc(sizeof(temp_texture_userdata_t));
-    userdata->width = width;
-    userdata->height = height;
-    lv_gpu_draw_cache_put_advanced(&key, sizeof(key), texture, userdata, SDL_free, 0);
-    return texture;
-}
-
-lv_gpu_sdl_cache_key_head_img_t * lv_gpu_sdl_img_cache_key_create(const void * src, int32_t frame_id, size_t * size)
-{
-    lv_gpu_sdl_cache_key_head_img_t header;
+    lv_draw_sdl_cache_key_head_img_t header;
     /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
     SDL_memset(&header, 0, sizeof(header));
     header.magic = LV_GPU_CACHE_KEY_MAGIC_IMG;
@@ -173,16 +141,12 @@ lv_gpu_sdl_cache_key_head_img_t * lv_gpu_sdl_img_cache_key_create(const void * s
         SDL_memcpy(key + sizeof(header), &src, sizeof(void *));
     }
     *size = key_size;
-    return (lv_gpu_sdl_cache_key_head_img_t *) key;
+    return (lv_draw_sdl_cache_key_head_img_t *) key;
 }
 
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
 static void draw_cache_free_value(draw_cache_value_t * value)
 {
-    if(value->texture && !(value->flags & LV_GPU_SDL_CACHE_FLAG_MANAGED)) {
+    if(value->texture && !(value->flags & LV_DRAW_SDL_CACHE_FLAG_MANAGED)) {
         LV_LOG_INFO("destroy texture %p", value->texture);
         SDL_DestroyTexture(value->texture);
     }
@@ -192,6 +156,23 @@ static void draw_cache_free_value(draw_cache_value_t * value)
     SDL_free(value);
 }
 
+static draw_cache_value_t * draw_cache_get_entry(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length,
+                                                 bool * found)
+{
+    lv_lru_t * lru = ctx->internals->texture_cache;
+    draw_cache_value_t * value = NULL;
+    lv_lru_get(lru, key, key_length, (void **) &value);
+    if(!value) {
+        if(found) {
+            *found = false;
+        }
+        return NULL;
+    }
+    if(found) {
+        *found = true;
+    }
+    return value;
+}
 
 #endif /*LV_USE_GPU_SDL*/
 
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_texture_cache.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_texture_cache.h
new file mode 100644
index 000000000..dc8b578e6
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_texture_cache.h
@@ -0,0 +1,102 @@
+/**
+ * @file lv_draw_sdl_texture_cache.h
+ *
+ */
+
+#ifndef LV_DRAW_SDL_TEXTURE_CACHE_H
+#define LV_DRAW_SDL_TEXTURE_CACHE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../../lv_conf_internal.h"
+
+#if LV_USE_GPU_SDL
+
+#include LV_GPU_SDL_INCLUDE_PATH
+#include "lv_draw_sdl.h"
+#include "lv_draw_sdl_priv.h"
+#include "../../draw/lv_img_decoder.h"
+#include "../../misc/lv_area.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+#define LV_DRAW_SDL_DEC_DSC_TEXTURE_HEAD "@LVSDLTex"
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    char head[8];
+    SDL_Texture * texture;
+    SDL_Rect rect;
+    bool texture_managed;
+    bool texture_referenced;
+} lv_draw_sdl_dec_dsc_userdata_t;
+
+typedef enum {
+    LV_GPU_CACHE_KEY_MAGIC_ARC = 0x01,
+    LV_GPU_CACHE_KEY_MAGIC_IMG = 0x11,
+    LV_GPU_CACHE_KEY_MAGIC_IMG_ROUNDED_CORNERS = 0x12,
+    LV_GPU_CACHE_KEY_MAGIC_LINE = 0x21,
+    LV_GPU_CACHE_KEY_MAGIC_RECT_BG = 0x31,
+    LV_GPU_CACHE_KEY_MAGIC_RECT_SHADOW = 0x32,
+    LV_GPU_CACHE_KEY_MAGIC_RECT_BORDER = 0x33,
+    LV_GPU_CACHE_KEY_MAGIC_FONT_GLYPH = 0x41,
+    LV_GPU_CACHE_KEY_MAGIC_MASK = 0x51,
+} lv_sdl_cache_key_magic_t;
+
+typedef enum {
+    LV_DRAW_SDL_CACHE_FLAG_NONE = 0,
+    LV_DRAW_SDL_CACHE_FLAG_MANAGED = 1,
+} lv_draw_sdl_cache_flag_t;
+
+typedef struct {
+    lv_sdl_cache_key_magic_t magic;
+    lv_img_src_t type;
+    int32_t frame_id;
+} lv_draw_sdl_cache_key_head_img_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+void lv_draw_sdl_texture_cache_init(lv_draw_sdl_ctx_t * ctx);
+
+void lv_draw_sdl_texture_cache_deinit(lv_draw_sdl_ctx_t * ctx);
+
+/**
+ * Find cached texture by key. The texture can be destroyed during usage.
+ */
+SDL_Texture * lv_draw_sdl_texture_cache_get(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length, bool * found);
+
+SDL_Texture * lv_draw_sdl_texture_cache_get_with_userdata(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length,
+                                                          bool * found, void ** userdata);
+
+void lv_draw_sdl_texture_cache_put(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length, SDL_Texture * texture);
+
+void lv_draw_sdl_texture_cache_put_advanced(lv_draw_sdl_ctx_t * ctx, const void * key, size_t key_length,
+                                            SDL_Texture * texture, void * userdata, void userdata_free(void *),
+                                            lv_draw_sdl_cache_flag_t flags);
+
+lv_draw_sdl_cache_key_head_img_t * lv_draw_sdl_texture_img_key_create(const void * src, int32_t frame_id,
+                                                                      size_t * size);
+
+/**********************
+ *      MACROS
+ **********************/
+#endif /*LV_USE_GPU_SDL*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SDL_TEXTURE_CACHE_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_utils.c b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_utils.c
similarity index 61%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_utils.c
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_utils.c
index d6486014a..3ca0fad45 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_utils.c
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_utils.c
@@ -1,5 +1,5 @@
 /**
- * @file lv_gpu_sdl_utils.c
+ * @file lv_draw_sdl_utils.c
  *
  */
 
@@ -10,9 +10,11 @@
 
 #if LV_USE_GPU_SDL
 
-#include "lv_gpu_sdl_utils.h"
+#include "lv_draw_sdl_utils.h"
 
-#include "../../draw/lv_draw_label.h"
+#include "../lv_draw.h"
+#include "../lv_draw_label.h"
+#include "../../core/lv_refr.h"
 
 /*********************
  *      DEFINES
@@ -25,15 +27,15 @@
 /**********************
  *  STATIC PROTOTYPES
  **********************/
-
 /**********************
  *  STATIC VARIABLES
  **********************/
+extern const uint8_t _lv_bpp1_opa_table[2];
+extern const uint8_t _lv_bpp2_opa_table[4];
+extern const uint8_t _lv_bpp4_opa_table[16];
+extern const uint8_t _lv_bpp8_opa_table[256];
 
-static SDL_Palette * lv_sdl_palette_grayscale1 = NULL;
-static SDL_Palette * lv_sdl_palette_grayscale2 = NULL;
-static SDL_Palette * lv_sdl_palette_grayscale3 = NULL;
-static SDL_Palette * lv_sdl_palette_grayscale4 = NULL;
+static int utils_init_count = 0;
 static SDL_Palette * lv_sdl_palette_grayscale8 = NULL;
 
 /**********************
@@ -44,22 +46,25 @@ static SDL_Palette * lv_sdl_palette_grayscale8 = NULL;
  *   GLOBAL FUNCTIONS
  **********************/
 
-void _lv_gpu_sdl_utils_init()
+void _lv_draw_sdl_utils_init()
 {
-    lv_sdl_palette_grayscale1 = lv_sdl_alloc_palette_for_bpp(_lv_bpp1_opa_table, 1);
-    lv_sdl_palette_grayscale2 = lv_sdl_alloc_palette_for_bpp(_lv_bpp2_opa_table, 2);
-    lv_sdl_palette_grayscale3 = lv_sdl_alloc_palette_for_bpp(_lv_bpp3_opa_table, 3);
-    lv_sdl_palette_grayscale4 = lv_sdl_alloc_palette_for_bpp(_lv_bpp4_opa_table, 4);
+    utils_init_count++;
+    if(utils_init_count > 1) {
+        return;
+    }
     lv_sdl_palette_grayscale8 = lv_sdl_alloc_palette_for_bpp(_lv_bpp8_opa_table, 8);
 }
 
-void _lv_gpu_sdl_utils_deinit()
+void _lv_draw_sdl_utils_deinit()
 {
-    SDL_FreePalette(lv_sdl_palette_grayscale1);
-    SDL_FreePalette(lv_sdl_palette_grayscale2);
-    SDL_FreePalette(lv_sdl_palette_grayscale3);
-    SDL_FreePalette(lv_sdl_palette_grayscale4);
-    SDL_FreePalette(lv_sdl_palette_grayscale8);
+    if(utils_init_count == 0) {
+        return;
+    }
+    utils_init_count--;
+    if(utils_init_count == 0) {
+        SDL_FreePalette(lv_sdl_palette_grayscale8);
+        lv_sdl_palette_grayscale8 = NULL;
+    }
 }
 
 void lv_area_to_sdl_rect(const lv_area_t * in, SDL_Rect * out)
@@ -72,12 +77,19 @@ void lv_area_to_sdl_rect(const lv_area_t * in, SDL_Rect * out)
 
 void lv_color_to_sdl_color(const lv_color_t * in, SDL_Color * out)
 {
+#if LV_COLOR_DEPTH == 32
+    out->a = in->ch.alpha;
+    out->r = in->ch.red;
+    out->g = in->ch.green;
+    out->b = in->ch.blue;
+#else
     uint32_t color32 = lv_color_to32(*in);
     lv_color32_t * color32_t = (lv_color32_t *) &color32;
     out->a = color32_t->ch.alpha;
     out->r = color32_t->ch.red;
     out->g = color32_t->ch.green;
     out->b = color32_t->ch.blue;
+#endif
 }
 
 void lv_area_zoom_to_sdl_rect(const lv_area_t * in, SDL_Rect * out, uint16_t zoom, const lv_point_t * pivot)
@@ -86,19 +98,10 @@ void lv_area_zoom_to_sdl_rect(const lv_area_t * in, SDL_Rect * out, uint16_t zoo
         lv_area_to_sdl_rect(in, out);
         return;
     }
-    int h = in->y2 - in->y1 + 1;
-    int w = in->x2 - in->x1 + 1;
-    int sh = h * zoom >> 8;
-    int sw = w * zoom >> 8;
-    out->x = in->x1 - (sw / 2 - pivot->x);
-    out->y = in->y1 - (sh / 2 - pivot->y);
-    out->w = sw;
-    out->h = sh;
-}
-
-double lv_sdl_round(double d)
-{
-    return (d - (long) d) < 0.5 ? SDL_floor(d) : SDL_ceil(d);
+    lv_area_t tmp;
+    _lv_img_buf_get_transformed_area(&tmp, lv_area_get_width(in), lv_area_get_height(in), 0, zoom, pivot);
+    lv_area_move(&tmp, in->x1, in->y1);
+    lv_area_to_sdl_rect(&tmp, out);
 }
 
 SDL_Palette * lv_sdl_alloc_palette_for_bpp(const uint8_t * mapping, uint8_t bpp)
@@ -115,21 +118,22 @@ SDL_Palette * lv_sdl_alloc_palette_for_bpp(const uint8_t * mapping, uint8_t bpp)
     return result;
 }
 
-SDL_Palette * lv_sdl_get_grayscale_palette(uint8_t bpp)
+SDL_Surface * lv_sdl_create_opa_surface(lv_opa_t * opa, lv_coord_t width, lv_coord_t height, lv_coord_t stride)
 {
-    switch(bpp) {
-        case 1:
-            return lv_sdl_palette_grayscale1;
-        case 2:
-            return lv_sdl_palette_grayscale2;
-        case 3:
-            return lv_sdl_palette_grayscale3;
-        case 4:
-            return lv_sdl_palette_grayscale4;
-        case 8:
-            return lv_sdl_palette_grayscale8;
-    }
-    return NULL;
+    SDL_Surface * indexed = SDL_CreateRGBSurfaceFrom(opa, width, height, 8, stride, 0, 0, 0, 0);
+    SDL_SetSurfacePalette(indexed, lv_sdl_palette_grayscale8);
+    SDL_Surface * converted = SDL_ConvertSurfaceFormat(indexed, LV_DRAW_SDL_TEXTURE_FORMAT, 0);
+    SDL_FreeSurface(indexed);
+    return converted;
+}
+
+SDL_Texture * lv_sdl_create_opa_texture(SDL_Renderer * renderer, lv_opa_t * pixels, lv_coord_t width,
+                                        lv_coord_t height, lv_coord_t stride)
+{
+    SDL_Surface * indexed = lv_sdl_create_opa_surface(pixels, width, height, stride);
+    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, indexed);
+    SDL_FreeSurface(indexed);
+    return texture;
 }
 
 void lv_sdl_to_8bpp(uint8_t * dest, const uint8_t * src, int width, int height, int stride, uint8_t bpp)
@@ -163,7 +167,7 @@ void lv_sdl_to_8bpp(uint8_t * dest, const uint8_t * src, int width, int height,
     while(cur < src_len) {
         curbit = 8 - bpp;
         uint8_t src_byte = src[cur * bpp / 8];
-        while(curbit >= 0) {
+        while(curbit >= 0 && cur < src_len) {
             uint8_t src_bits = opa_mask & (src_byte >> curbit);
             dest[(cur / width * stride) + (cur % width)] = opa_table[src_bits];
             curbit -= bpp;
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_utils.h b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_utils.h
similarity index 64%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_utils.h
rename to lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_utils.h
index c2daeb79b..9afae6879 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_utils.h
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sdl/lv_draw_sdl_utils.h
@@ -1,9 +1,9 @@
 /**
- * @file lv_gpu_sdl_utils.h
+ * @file lv_draw_sdl_utils.h
  *
  */
-#ifndef LV_GPU_SDL_UTILS_H
-#define LV_GPU_SDL_UTILS_H
+#ifndef LV_DRAW_SDL_UTILS_H
+#define LV_DRAW_SDL_UTILS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,7 +14,9 @@ extern "C" {
  *********************/
 
 #include "../../lv_conf_internal.h"
+#if LV_USE_GPU_SDL
 
+#include "lv_draw_sdl.h"
 #include "../../misc/lv_color.h"
 #include "../../misc/lv_area.h"
 
@@ -32,9 +34,9 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
-void _lv_gpu_sdl_utils_init();
+void _lv_draw_sdl_utils_init();
 
-void _lv_gpu_sdl_utils_deinit();
+void _lv_draw_sdl_utils_deinit();
 
 void lv_area_to_sdl_rect(const lv_area_t * in, SDL_Rect * out);
 
@@ -42,11 +44,12 @@ void lv_color_to_sdl_color(const lv_color_t * in, SDL_Color * out);
 
 void lv_area_zoom_to_sdl_rect(const lv_area_t * in, SDL_Rect * out, uint16_t zoom, const lv_point_t * pivot);
 
-double lv_sdl_round(double d);
-
 SDL_Palette * lv_sdl_alloc_palette_for_bpp(const uint8_t * mapping, uint8_t bpp);
 
-SDL_Palette * lv_sdl_get_grayscale_palette(uint8_t bpp);
+SDL_Surface * lv_sdl_create_opa_surface(lv_opa_t * opa, lv_coord_t width, lv_coord_t height, lv_coord_t stride);
+
+SDL_Texture * lv_sdl_create_opa_texture(SDL_Renderer * renderer, lv_opa_t * pixels, lv_coord_t width,
+                                        lv_coord_t height, lv_coord_t stride);
 
 void lv_sdl_to_8bpp(uint8_t * dest, const uint8_t * src, int width, int height, int stride, uint8_t bpp);
 
@@ -54,8 +57,9 @@ void lv_sdl_to_8bpp(uint8_t * dest, const uint8_t * src, int width, int height,
  *      MACROS
  **********************/
 
+#endif /*LV_USE_GPU_SDL*/
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
 
-#endif /*LV_GPU_SDL_UTILS_H*/
+#endif /*LV_DRAW_SDL_UTILS_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c b/lib/libesp32_lvgl/lvgl/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c
new file mode 100644
index 000000000..20344a567
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c
@@ -0,0 +1,256 @@
+/**
+ * @file lv_gpu_stm32_dma2d.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_gpu_stm32_dma2d.h"
+#include "../../core/lv_refr.h"
+
+#if LV_USE_GPU_STM32_DMA2D
+
+#include LV_GPU_DMA2D_CMSIS_INCLUDE
+
+/*********************
+ *      DEFINES
+ *********************/
+
+#if LV_COLOR_16_SWAP
+    // TODO: F7 has red blue swap bit in control register for all layers and output
+    #error "Can't use DMA2D with LV_COLOR_16_SWAP 1"
+#endif
+
+#if LV_COLOR_DEPTH == 8
+    #error "Can't use DMA2D with LV_COLOR_DEPTH == 8"
+#endif
+
+#if LV_COLOR_DEPTH == 16
+    #define LV_DMA2D_COLOR_FORMAT LV_DMA2D_RGB565
+#elif LV_COLOR_DEPTH == 32
+    #define LV_DMA2D_COLOR_FORMAT LV_DMA2D_ARGB8888
+#else
+    /*Can't use GPU with other formats*/
+#endif
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static void lv_draw_stm32_dma2d_blend_fill(lv_color_t * dest_buf, lv_coord_t dest_stride, const lv_area_t * fill_area,
+                                           lv_color_t color);
+
+
+static void lv_draw_stm32_dma2d_blend_map(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                                          const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa);
+
+static void lv_draw_stm32_dma2d_img_decoded(lv_draw_ctx_t * draw, const lv_draw_img_dsc_t * dsc,
+                                            const lv_area_t * coords, const uint8_t * map_p, lv_img_cf_t color_format);
+
+
+static void invalidate_cache(void);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Turn on the peripheral and set output color mode, this only needs to be done once
+ */
+void lv_draw_stm32_dma2d_init(void)
+{
+    /*Enable DMA2D clock*/
+#if defined(STM32F4) || defined(STM32F7)
+    RCC->AHB1ENR |= RCC_AHB1ENR_DMA2DEN;
+#elif defined(STM32H7)
+    RCC->AHB3ENR |= RCC_AHB3ENR_DMA2DEN;
+#else
+# warning "LVGL can't enable the clock of DMA2D"
+#endif
+
+    /*Wait for hardware access to complete*/
+    __asm volatile("DSB\n");
+
+    /*Delay after setting peripheral clock*/
+    volatile uint32_t temp = RCC->AHB1ENR;
+    LV_UNUSED(temp);
+
+    /*set output colour mode*/
+    DMA2D->OPFCCR = LV_DMA2D_COLOR_FORMAT;
+}
+
+
+void lv_draw_stm32_dma2d_ctx_init(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
+{
+
+    lv_draw_sw_init_ctx(drv, draw_ctx);
+
+    lv_draw_stm32_dma2d_ctx_t * dma2d_draw_ctx = (lv_draw_sw_ctx_t *)draw_ctx;
+
+    dma2d_draw_ctx->blend = lv_draw_stm32_dma2d_blend;
+    //    dma2d_draw_ctx->base_draw.draw_img_decoded = lv_draw_stm32_dma2d_img_decoded;
+    dma2d_draw_ctx->base_draw.wait_for_finish = lv_gpu_stm32_dma2d_wait_cb;
+
+}
+
+void lv_draw_stm32_dma2d_ctx_deinit(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
+{
+    LV_UNUSED(drv);
+    LV_UNUSED(draw_ctx);
+}
+
+
+void lv_draw_stm32_dma2d_blend(lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc)
+{
+    lv_area_t blend_area;
+    if(!_lv_area_intersect(&blend_area, dsc->blend_area, draw_ctx->clip_area)) return;
+
+    bool done = false;
+
+    if(dsc->mask_buf == NULL && dsc->blend_mode == LV_BLEND_MODE_NORMAL && lv_area_get_size(&blend_area) > 100) {
+        lv_coord_t dest_stride = lv_area_get_width(draw_ctx->buf_area);
+
+        lv_color_t * dest_buf = draw_ctx->buf;
+        dest_buf += dest_stride * (blend_area.y1 - draw_ctx->buf_area->y1) + (blend_area.x1 - draw_ctx->buf_area->x1);
+
+        const lv_color_t * src_buf = dsc->src_buf;
+        if(src_buf) {
+            lv_draw_sw_blend_basic(draw_ctx, dsc);
+            lv_coord_t src_stride;
+            src_stride = lv_area_get_width(dsc->blend_area);
+            src_buf += src_stride * (blend_area.y1 - dsc->blend_area->y1) + (blend_area.x1 -  dsc->blend_area->x1);
+            lv_area_move(&blend_area, -draw_ctx->buf_area->x1, -draw_ctx->buf_area->y1);
+            lv_draw_stm32_dma2d_blend_map(dest_buf, &blend_area, dest_stride, src_buf, src_stride, dsc->opa);
+            done = true;
+        }
+        else if(dsc->opa >= LV_OPA_MAX) {
+            lv_area_move(&blend_area, -draw_ctx->buf_area->x1, -draw_ctx->buf_area->y1);
+            lv_draw_stm32_dma2d_blend_fill(dest_buf, dest_stride, &blend_area, dsc->color);
+            done = true;
+        }
+    }
+
+    if(!done) lv_draw_sw_blend_basic(draw_ctx, dsc);
+}
+
+
+static void lv_draw_stm32_dma2d_img_decoded(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * dsc,
+                                            const lv_area_t * coords, const uint8_t * map_p, lv_img_cf_t color_format)
+{
+    /*TODO basic ARGB8888 image can be handles here*/
+
+    lv_draw_sw_img_decoded(draw_ctx, dsc, coords, map_p, color_format);
+}
+
+static void lv_draw_stm32_dma2d_blend_fill(lv_color_t * dest_buf, lv_coord_t dest_stride, const lv_area_t * fill_area,
+                                           lv_color_t color)
+{
+    /*Simply fill an area*/
+    int32_t area_w = lv_area_get_width(fill_area);
+    int32_t area_h = lv_area_get_height(fill_area);
+    invalidate_cache();
+
+    DMA2D->CR = 0x30000;
+    DMA2D->OMAR = (uint32_t)dest_buf;
+    /*as input color mode is same as output we don't need to convert here do we?*/
+    DMA2D->OCOLR = color.full;
+    DMA2D->OOR = dest_stride - area_w;
+    DMA2D->NLR = (area_w << DMA2D_NLR_PL_Pos) | (area_h << DMA2D_NLR_NL_Pos);
+
+    /*start transfer*/
+    DMA2D->CR |= DMA2D_CR_START_Msk;
+
+}
+
+
+static void lv_draw_stm32_dma2d_blend_map(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                                          const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa)
+{
+
+    /*Simple copy*/
+    int32_t dest_w = lv_area_get_width(dest_area);
+    int32_t dest_h = lv_area_get_height(dest_area);
+
+    invalidate_cache();
+    if(opa >= LV_OPA_MAX) {
+        DMA2D->CR = 0;
+        /*copy output colour mode, this register controls both input and output colour format*/
+        DMA2D->FGPFCCR = LV_DMA2D_COLOR_FORMAT;
+        DMA2D->FGMAR = (uint32_t)src_buf;
+        DMA2D->FGOR = src_stride - dest_w;
+        DMA2D->OMAR = (uint32_t)dest_buf;
+        DMA2D->OOR = dest_stride - dest_w;
+        DMA2D->NLR = (dest_w << DMA2D_NLR_PL_Pos) | (dest_h << DMA2D_NLR_NL_Pos);
+
+        /*start transfer*/
+        DMA2D->CR |= DMA2D_CR_START_Msk;
+    }
+    else {
+        DMA2D->CR = 0x20000;
+
+        DMA2D->BGPFCCR = LV_DMA2D_COLOR_FORMAT;
+        DMA2D->BGMAR = (uint32_t)dest_buf;
+        DMA2D->BGOR = dest_stride - dest_w;
+
+        DMA2D->FGPFCCR = (uint32_t)LV_DMA2D_COLOR_FORMAT
+                         /*alpha mode 2, replace with foreground * alpha value*/
+                         | (2 << DMA2D_FGPFCCR_AM_Pos)
+                         /*alpha value*/
+                         | (opa << DMA2D_FGPFCCR_ALPHA_Pos);
+        DMA2D->FGMAR = (uint32_t)src_buf;
+        DMA2D->FGOR = src_stride - dest_w;
+
+        DMA2D->OMAR = (uint32_t)src_buf;
+        DMA2D->OOR = src_stride - dest_w;
+        DMA2D->NLR = (dest_w << DMA2D_NLR_PL_Pos) | (dest_h << DMA2D_NLR_NL_Pos);
+
+        /*start transfer*/
+        DMA2D->CR |= DMA2D_CR_START_Msk;
+    }
+}
+
+void lv_gpu_stm32_dma2d_wait_cb(lv_draw_ctx_t * draw_ctx)
+{
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+    if(disp->driver && disp->driver->wait_cb) {
+        while(DMA2D->CR & DMA2D_CR_START_Msk) {
+            disp->driver->wait_cb(disp->driver);
+        }
+    }
+    else {
+        while(DMA2D->CR & DMA2D_CR_START_Msk);
+    }
+    lv_draw_sw_wait_for_finish(draw_ctx);
+
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void invalidate_cache(void)
+{
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+    if(disp->driver->clean_dcache_cb) disp->driver->clean_dcache_cb(disp->driver);
+    else {
+#if __CORTEX_M >= 0x07
+        if((SCB->CCR) & (uint32_t)SCB_CCR_DC_Msk)
+            SCB_CleanInvalidateDCache();
+#endif
+    }
+}
+
+#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h b/lib/libesp32_lvgl/lvgl/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h
new file mode 100644
index 000000000..73054ca2d
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h
@@ -0,0 +1,66 @@
+/**
+ * @file lv_gpu_stm32_dma2d.h
+ *
+ */
+
+#ifndef LV_GPU_STM32_DMA2D_H
+#define LV_GPU_STM32_DMA2D_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../misc/lv_color.h"
+#include "../../hal/lv_hal_disp.h"
+#include "../sw/lv_draw_sw.h"
+
+#if LV_USE_GPU_STM32_DMA2D
+
+/*********************
+ *      DEFINES
+ *********************/
+
+#define LV_DMA2D_ARGB8888 0
+#define LV_DMA2D_RGB888 1
+#define LV_DMA2D_RGB565 2
+#define LV_DMA2D_ARGB1555 3
+#define LV_DMA2D_ARGB4444 4
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+typedef lv_draw_sw_ctx_t lv_draw_stm32_dma2d_ctx_t;
+
+struct _lv_disp_drv_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Turn on the peripheral and set output color mode, this only needs to be done once
+ */
+void lv_draw_stm32_dma2d_init(void);
+
+void lv_draw_stm32_dma2d_ctx_init(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx);
+
+void lv_draw_stm32_dma2d_ctx_deinit(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx);
+
+void lv_draw_stm32_dma2d_blend(lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc);
+
+void lv_gpu_stm32_dma2d_wait_cb(lv_draw_ctx_t * draw_ctx);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif  /*LV_USE_GPU_STM32_DMA2D*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_GPU_STM32_DMA2D_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.c
new file mode 100644
index 000000000..21da4ee6b
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.c
@@ -0,0 +1,74 @@
+/**
+ * @file lv_draw_sw.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../lv_draw.h"
+#include "lv_draw_sw.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  GLOBAL PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sw_init_ctx(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
+{
+    LV_UNUSED(drv);
+
+    lv_draw_sw_ctx_t * draw_sw_ctx = (lv_draw_sw_ctx_t *) draw_ctx;
+    lv_memset_00(draw_sw_ctx, sizeof(lv_draw_sw_ctx_t));
+
+    draw_sw_ctx->base_draw.draw_arc = lv_draw_sw_arc;
+    draw_sw_ctx->base_draw.draw_rect = lv_draw_sw_rect;
+    draw_sw_ctx->base_draw.draw_bg = lv_draw_sw_bg;
+    draw_sw_ctx->base_draw.draw_letter = lv_draw_sw_letter;
+    draw_sw_ctx->base_draw.draw_img_decoded = lv_draw_sw_img_decoded;
+    draw_sw_ctx->base_draw.draw_line = lv_draw_sw_line;
+    draw_sw_ctx->base_draw.draw_polygon = lv_draw_sw_polygon;
+    draw_sw_ctx->base_draw.wait_for_finish = lv_draw_sw_wait_for_finish;
+    draw_sw_ctx->blend = lv_draw_sw_blend_basic;
+}
+
+void lv_draw_sw_deinit_ctx(lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx)
+{
+    LV_UNUSED(drv);
+
+    lv_draw_sw_ctx_t * draw_sw_ctx = (lv_draw_sw_ctx_t *) draw_ctx;
+    lv_memset_00(draw_sw_ctx, sizeof(lv_draw_sw_ctx_t));
+}
+
+void lv_draw_sw_wait_for_finish(lv_draw_ctx_t * draw_ctx)
+{
+    LV_UNUSED(draw_ctx);
+    /*Nothing to wait for*/
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.h b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.h
new file mode 100644
index 000000000..cba5b480b
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.h
@@ -0,0 +1,78 @@
+/**
+ * @file lv_draw_sw.h
+ *
+ */
+
+#ifndef LV_DRAW_SW_H
+#define LV_DRAW_SW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw_blend.h"
+#include "../lv_draw.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_color.h"
+#include "../../hal/lv_hal_disp.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+struct _lv_disp_drv_t;
+
+typedef struct {
+    lv_draw_ctx_t base_draw;
+
+    /** Fill an area of the destination buffer with a color*/
+    void (*blend)(lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc);
+} lv_draw_sw_ctx_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+void lv_draw_sw_init_ctx(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx);
+void lv_draw_sw_deinit_ctx(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx);
+
+void lv_draw_sw_wait_for_finish(lv_draw_ctx_t * draw_ctx);
+
+void lv_draw_sw_arc(lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center, uint16_t radius,
+                    uint16_t start_angle, uint16_t end_angle);
+
+void lv_draw_sw_rect(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+
+void lv_draw_sw_bg(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+void lv_draw_sw_letter(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc, const lv_point_t * pos_p,
+                       uint32_t letter);
+
+LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_img_decoded(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                                                  const lv_area_t * coords, const uint8_t * src_buf, lv_img_cf_t cf);
+
+LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_line(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                           const lv_point_t * point1, const lv_point_t * point2);
+
+void lv_draw_sw_polygon(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc,
+                        const lv_point_t * points, uint16_t point_cnt);
+
+/***********************
+ * GLOBAL VARIABLES
+ ***********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SW_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.mk b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.mk
new file mode 100644
index 000000000..386d9ed81
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw.mk
@@ -0,0 +1,15 @@
+CSRCS += lv_draw_sw.c
+CSRCS += lv_draw_sw_arc.c
+CSRCS += lv_draw_sw_blend.c
+CSRCS += lv_draw_sw_img.c
+CSRCS += lv_draw_sw_letter.c
+CSRCS += lv_draw_sw_line.c
+CSRCS += lv_draw_sw_rect.c
+CSRCS += lv_draw_sw_polygon.c
+CSRCS += lv_draw_sw_gradient.c
+CSRCS += lv_draw_sw_dither.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw
+
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw"
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_arc.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_arc.c
new file mode 100644
index 000000000..d020fdd4f
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_arc.c
@@ -0,0 +1,531 @@
+/**
+ * @file lv_draw_arc.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw.h"
+#include "../../misc/lv_math.h"
+#include "../../misc/lv_log.h"
+#include "../../misc/lv_mem.h"
+#include "../lv_draw.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define SPLIT_RADIUS_LIMIT 10  /*With radius greater than this the arc will drawn in quarters. A quarter is drawn only if there is arc in it*/
+#define SPLIT_ANGLE_GAP_LIMIT 60  /*With small gaps in the arc don't bother with splitting because there is nothing to skip.*/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+typedef struct {
+    const lv_point_t * center;
+    lv_coord_t radius;
+    uint16_t start_angle;
+    uint16_t end_angle;
+    uint16_t start_quarter;
+    uint16_t end_quarter;
+    lv_coord_t width;
+    lv_draw_rect_dsc_t * draw_dsc;
+    const lv_area_t * draw_area;
+    lv_draw_ctx_t * draw_ctx;
+} quarter_draw_dsc_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+#if LV_DRAW_COMPLEX
+    static void draw_quarter_0(quarter_draw_dsc_t * q);
+    static void draw_quarter_1(quarter_draw_dsc_t * q);
+    static void draw_quarter_2(quarter_draw_dsc_t * q);
+    static void draw_quarter_3(quarter_draw_dsc_t * q);
+    static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area);
+#endif /*LV_DRAW_COMPLEX*/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sw_arc(lv_draw_ctx_t * draw_ctx, const lv_draw_arc_dsc_t * dsc, const lv_point_t * center, uint16_t radius,
+                    uint16_t start_angle, uint16_t end_angle)
+{
+#if LV_DRAW_COMPLEX
+    if(dsc->opa <= LV_OPA_MIN) return;
+    if(dsc->width == 0) return;
+    if(start_angle == end_angle) return;
+
+    lv_coord_t width = dsc->width;
+    if(width > radius) width = radius;
+
+    lv_draw_rect_dsc_t cir_dsc;
+    lv_draw_rect_dsc_init(&cir_dsc);
+    cir_dsc.blend_mode = dsc->blend_mode;
+    if(dsc->img_src) {
+        cir_dsc.bg_opa = LV_OPA_TRANSP;
+        cir_dsc.bg_img_src = dsc->img_src;
+        cir_dsc.bg_img_opa = dsc->opa;
+    }
+    else {
+        cir_dsc.bg_opa = dsc->opa;
+        cir_dsc.bg_color = dsc->color;
+    }
+
+    lv_area_t area_out;
+    area_out.x1 = center->x - radius;
+    area_out.y1 = center->y - radius;
+    area_out.x2 = center->x + radius - 1;  /*-1 because the center already belongs to the left/bottom part*/
+    area_out.y2 = center->y + radius - 1;
+
+    lv_area_t area_in;
+    lv_area_copy(&area_in, &area_out);
+    area_in.x1 += dsc->width;
+    area_in.y1 += dsc->width;
+    area_in.x2 -= dsc->width;
+    area_in.y2 -= dsc->width;
+
+    /*Create inner the mask*/
+    int16_t mask_in_id = LV_MASK_ID_INV;
+    lv_draw_mask_radius_param_t mask_in_param;
+    if(lv_area_get_width(&area_in) > 0 && lv_area_get_height(&area_in) > 0) {
+        lv_draw_mask_radius_init(&mask_in_param, &area_in, LV_RADIUS_CIRCLE, true);
+        mask_in_id = lv_draw_mask_add(&mask_in_param, NULL);
+    }
+
+    lv_draw_mask_radius_param_t mask_out_param;
+    lv_draw_mask_radius_init(&mask_out_param, &area_out, LV_RADIUS_CIRCLE, false);
+    int16_t mask_out_id = lv_draw_mask_add(&mask_out_param, NULL);
+
+    /*Draw a full ring*/
+    if(start_angle + 360 == end_angle || start_angle == end_angle + 360) {
+        cir_dsc.radius = LV_RADIUS_CIRCLE;
+        lv_draw_rect(draw_ctx, &cir_dsc, &area_out);
+
+        lv_draw_mask_remove_id(mask_out_id);
+        if(mask_in_id != LV_MASK_ID_INV) lv_draw_mask_remove_id(mask_in_id);
+
+        lv_draw_mask_free_param(&mask_out_param);
+        lv_draw_mask_free_param(&mask_in_param);
+
+        return;
+    }
+
+    while(start_angle >= 360) start_angle -= 360;
+    while(end_angle >= 360) end_angle -= 360;
+
+    lv_draw_mask_angle_param_t mask_angle_param;
+    lv_draw_mask_angle_init(&mask_angle_param, center->x, center->y, start_angle, end_angle);
+    int16_t mask_angle_id = lv_draw_mask_add(&mask_angle_param, NULL);
+
+    int32_t angle_gap;
+    if(end_angle > start_angle) {
+        angle_gap = 360 - (end_angle - start_angle);
+    }
+    else {
+        angle_gap = start_angle - end_angle;
+    }
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+
+    if(angle_gap > SPLIT_ANGLE_GAP_LIMIT && radius > SPLIT_RADIUS_LIMIT) {
+        /*Handle each quarter individually and skip which is empty*/
+        quarter_draw_dsc_t q_dsc;
+        q_dsc.center = center;
+        q_dsc.radius = radius;
+        q_dsc.start_angle = start_angle;
+        q_dsc.end_angle = end_angle;
+        q_dsc.start_quarter = (start_angle / 90) & 0x3;
+        q_dsc.end_quarter = (end_angle / 90) & 0x3;
+        q_dsc.width = width;
+        q_dsc.draw_dsc = &cir_dsc;
+        q_dsc.draw_area = &area_out;
+        q_dsc.draw_ctx = draw_ctx;
+
+        draw_quarter_0(&q_dsc);
+        draw_quarter_1(&q_dsc);
+        draw_quarter_2(&q_dsc);
+        draw_quarter_3(&q_dsc);
+    }
+    else {
+        lv_draw_rect(draw_ctx, &cir_dsc, &area_out);
+    }
+
+    lv_draw_mask_free_param(&mask_angle_param);
+    lv_draw_mask_free_param(&mask_out_param);
+    lv_draw_mask_free_param(&mask_in_param);
+
+    lv_draw_mask_remove_id(mask_angle_id);
+    lv_draw_mask_remove_id(mask_out_id);
+    if(mask_in_id != LV_MASK_ID_INV) lv_draw_mask_remove_id(mask_in_id);
+
+    if(dsc->rounded) {
+
+        lv_draw_mask_radius_param_t mask_end_param;
+
+        lv_area_t round_area;
+        get_rounded_area(start_angle, radius, width, &round_area);
+        round_area.x1 += center->x;
+        round_area.x2 += center->x;
+        round_area.y1 += center->y;
+        round_area.y2 += center->y;
+        lv_area_t clip_area2;
+        if(_lv_area_intersect(&clip_area2, clip_area_ori, &round_area)) {
+            lv_draw_mask_radius_init(&mask_end_param, &round_area, LV_RADIUS_CIRCLE, false);
+            int16_t mask_end_id = lv_draw_mask_add(&mask_end_param, NULL);
+
+            draw_ctx->clip_area = &clip_area2;
+            lv_draw_rect(draw_ctx, &cir_dsc, &area_out);
+            lv_draw_mask_remove_id(mask_end_id);
+            lv_draw_mask_free_param(&mask_end_param);
+        }
+
+        get_rounded_area(end_angle, radius, width, &round_area);
+        round_area.x1 += center->x;
+        round_area.x2 += center->x;
+        round_area.y1 += center->y;
+        round_area.y2 += center->y;
+        if(_lv_area_intersect(&clip_area2, clip_area_ori, &round_area)) {
+            lv_draw_mask_radius_init(&mask_end_param, &round_area, LV_RADIUS_CIRCLE, false);
+            int16_t mask_end_id = lv_draw_mask_add(&mask_end_param, NULL);
+
+            draw_ctx->clip_area = &clip_area2;
+            lv_draw_rect(draw_ctx, &cir_dsc, &area_out);
+            lv_draw_mask_remove_id(mask_end_id);
+            lv_draw_mask_free_param(&mask_end_param);
+        }
+        draw_ctx->clip_area = clip_area_ori;
+    }
+#else
+    LV_LOG_WARN("Can't draw arc with LV_DRAW_COMPLEX == 0");
+    LV_UNUSED(center);
+    LV_UNUSED(radius);
+    LV_UNUSED(start_angle);
+    LV_UNUSED(end_angle);
+    LV_UNUSED(draw_ctx);
+    LV_UNUSED(dsc);
+#endif /*LV_DRAW_COMPLEX*/
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+#if LV_DRAW_COMPLEX
+static void draw_quarter_0(quarter_draw_dsc_t * q)
+{
+    const lv_area_t * clip_area_ori = q->draw_ctx->clip_area;
+    lv_area_t quarter_area;
+
+    if(q->start_quarter == 0 && q->end_quarter == 0 && q->start_angle < q->end_angle) {
+        /*Small arc here*/
+        quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+        quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+        quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->end_angle) * q->radius) >> LV_TRIGO_SHIFT);
+        quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    else if(q->start_quarter == 0 || q->end_quarter == 0) {
+        /*Start and/or end arcs here*/
+        if(q->start_quarter == 0) {
+            quarter_area.x1 = q->center->x;
+            quarter_area.y2 = q->center->y + q->radius;
+
+            quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+            quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+        if(q->end_quarter == 0) {
+            quarter_area.x2 = q->center->x + q->radius;
+            quarter_area.y1 = q->center->y;
+
+            quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->end_angle) * q->radius) >> LV_TRIGO_SHIFT);
+            quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+    }
+    else if((q->start_quarter == q->end_quarter && q->start_quarter != 0 && q->end_angle < q->start_angle) ||
+            (q->start_quarter == 2 && q->end_quarter == 1) ||
+            (q->start_quarter == 3 && q->end_quarter == 2) ||
+            (q->start_quarter == 3 && q->end_quarter == 1)) {
+        /*Arc crosses here*/
+        quarter_area.x1 = q->center->x;
+        quarter_area.y1 = q->center->y;
+        quarter_area.x2 = q->center->x + q->radius;
+        quarter_area.y2 = q->center->y + q->radius;
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    q->draw_ctx->clip_area = clip_area_ori;
+}
+
+static void draw_quarter_1(quarter_draw_dsc_t * q)
+{
+    const lv_area_t * clip_area_ori = q->draw_ctx->clip_area;
+    lv_area_t quarter_area;
+
+    if(q->start_quarter == 1 && q->end_quarter == 1 && q->start_angle < q->end_angle) {
+        /*Small arc here*/
+        quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
+        quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+        quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+        quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    else if(q->start_quarter == 1 || q->end_quarter == 1) {
+        /*Start and/or end arcs here*/
+        if(q->start_quarter == 1) {
+            quarter_area.x1 = q->center->x - q->radius;
+            quarter_area.y1 = q->center->y;
+
+            quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
+            quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+        if(q->end_quarter == 1) {
+            quarter_area.x2 = q->center->x - 1;
+            quarter_area.y2 = q->center->y + q->radius;
+
+            quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+            quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+    }
+    else if((q->start_quarter == q->end_quarter && q->start_quarter != 1 && q->end_angle < q->start_angle) ||
+            (q->start_quarter == 0 && q->end_quarter == 2) ||
+            (q->start_quarter == 0 && q->end_quarter == 3) ||
+            (q->start_quarter == 3 && q->end_quarter == 2)) {
+        /*Arc crosses here*/
+        quarter_area.x1 = q->center->x - q->radius;
+        quarter_area.y1 = q->center->y;
+        quarter_area.x2 = q->center->x - 1;
+        quarter_area.y2 = q->center->y + q->radius;
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    q->draw_ctx->clip_area = clip_area_ori;
+}
+
+static void draw_quarter_2(quarter_draw_dsc_t * q)
+{
+    const lv_area_t * clip_area_ori = q->draw_ctx->clip_area;
+    lv_area_t quarter_area;
+
+    if(q->start_quarter == 2 && q->end_quarter == 2 && q->start_angle < q->end_angle) {
+        /*Small arc here*/
+        quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+        quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+        quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->end_angle) * q->radius) >> LV_TRIGO_SHIFT);
+        quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    else if(q->start_quarter == 2 || q->end_quarter == 2) {
+        /*Start and/or end arcs here*/
+        if(q->start_quarter == 2) {
+            quarter_area.x2 = q->center->x - 1;
+            quarter_area.y1 = q->center->y - q->radius;
+
+            quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+            quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+        if(q->end_quarter == 2) {
+            quarter_area.x1 = q->center->x - q->radius;
+            quarter_area.y2 = q->center->y - 1;
+
+            quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+            quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->end_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+    }
+    else if((q->start_quarter == q->end_quarter && q->start_quarter != 2 && q->end_angle < q->start_angle) ||
+            (q->start_quarter == 0 && q->end_quarter == 3) ||
+            (q->start_quarter == 1 && q->end_quarter == 3) ||
+            (q->start_quarter == 1 && q->end_quarter == 0)) {
+        /*Arc crosses here*/
+        quarter_area.x1 = q->center->x - q->radius;
+        quarter_area.y1 = q->center->y - q->radius;
+        quarter_area.x2 = q->center->x - 1;
+        quarter_area.y2 = q->center->y - 1;
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    q->draw_ctx->clip_area = clip_area_ori;
+}
+
+static void draw_quarter_3(quarter_draw_dsc_t * q)
+{
+    const lv_area_t * clip_area_ori = q->draw_ctx->clip_area;
+    lv_area_t quarter_area;
+
+    if(q->start_quarter == 3 && q->end_quarter == 3 && q->start_angle < q->end_angle) {
+        /*Small arc here*/
+        quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+        quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+        quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+        quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+    else if(q->start_quarter == 3 || q->end_quarter == 3) {
+        /*Start and/or end arcs here*/
+        if(q->start_quarter == 3) {
+            quarter_area.x2 = q->center->x + q->radius;
+            quarter_area.y2 = q->center->y - 1;
+
+            quarter_area.x1 = q->center->x + ((lv_trigo_sin(q->start_angle + 90) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+            quarter_area.y1 = q->center->y + ((lv_trigo_sin(q->start_angle) * (q->radius)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+        if(q->end_quarter == 3) {
+            quarter_area.x1 = q->center->x;
+            quarter_area.y1 = q->center->y - q->radius;
+
+            quarter_area.x2 = q->center->x + ((lv_trigo_sin(q->end_angle + 90) * (q->radius)) >> LV_TRIGO_SHIFT);
+            quarter_area.y2 = q->center->y + ((lv_trigo_sin(q->end_angle) * (q->radius - q->width)) >> LV_TRIGO_SHIFT);
+
+            bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+            if(ok) {
+                q->draw_ctx->clip_area = &quarter_area;
+                lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+            }
+        }
+    }
+    else if((q->start_quarter == q->end_quarter && q->start_quarter != 3 && q->end_angle < q->start_angle) ||
+            (q->start_quarter == 2 && q->end_quarter == 0) ||
+            (q->start_quarter == 1 && q->end_quarter == 0) ||
+            (q->start_quarter == 2 && q->end_quarter == 1)) {
+        /*Arc crosses here*/
+        quarter_area.x1 = q->center->x;
+        quarter_area.y1 = q->center->y - q->radius;
+        quarter_area.x2 = q->center->x + q->radius;
+        quarter_area.y2 = q->center->y - 1;
+
+        bool ok = _lv_area_intersect(&quarter_area, &quarter_area, clip_area_ori);
+        if(ok) {
+            q->draw_ctx->clip_area = &quarter_area;
+            lv_draw_rect(q->draw_ctx, q->draw_dsc, &quarter_area);
+        }
+    }
+
+    q->draw_ctx->clip_area = clip_area_ori;
+}
+
+static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area)
+{
+    const uint8_t ps = 8;
+    const uint8_t pa = 127;
+
+    int32_t thick_half = thickness / 2;
+    uint8_t thick_corr = (thickness & 0x01) ? 0 : 1;
+
+    int32_t cir_x;
+    int32_t cir_y;
+
+    cir_x = ((radius - thick_half) * lv_trigo_sin(90 - angle)) >> (LV_TRIGO_SHIFT - ps);
+    cir_y = ((radius - thick_half) * lv_trigo_sin(angle)) >> (LV_TRIGO_SHIFT - ps);
+
+    /*Actually the center of the pixel need to be calculated so apply 1/2 px offset*/
+    if(cir_x > 0) {
+        cir_x = (cir_x - pa) >> ps;
+        res_area->x1 = cir_x - thick_half + thick_corr;
+        res_area->x2 = cir_x + thick_half;
+    }
+    else {
+        cir_x = (cir_x + pa) >> ps;
+        res_area->x1 = cir_x - thick_half;
+        res_area->x2 = cir_x + thick_half - thick_corr;
+    }
+
+    if(cir_y > 0) {
+        cir_y = (cir_y - pa) >> ps;
+        res_area->y1 = cir_y - thick_half + thick_corr;
+        res_area->y2 = cir_y + thick_half;
+    }
+    else {
+        cir_y = (cir_y + pa) >> ps;
+        res_area->y1 = cir_y - thick_half;
+        res_area->y2 = cir_y + thick_half - thick_corr;
+    }
+}
+
+#endif /*LV_DRAW_COMPLEX*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_blend.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_blend.c
new file mode 100644
index 000000000..82d013888
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_blend.c
@@ -0,0 +1,757 @@
+/**
+ * @file lv_draw_sw_blend.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw.h"
+#include "../../misc/lv_math.h"
+#include "../../hal/lv_hal_disp.h"
+#include "../../core/lv_refr.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static void fill_set_px(lv_color_t * dest_buf, const lv_area_t * blend_area, lv_coord_t dest_stride,
+                        lv_color_t color, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stide);
+LV_ATTRIBUTE_FAST_MEM static void fill_normal(lv_color_t * dest_buf, const lv_area_t * dest_area,
+                                              lv_coord_t dest_stride, lv_color_t color, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride);
+#if LV_DRAW_COMPLEX
+static void fill_blended(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride, lv_color_t color,
+                         lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride, lv_blend_mode_t blend_mode);
+#endif  /*LV_DRAW_COMPLEX*/
+
+static void map_set_px(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                       const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride);
+
+LV_ATTRIBUTE_FAST_MEM static void map_normal(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                                             const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride);
+
+#if LV_DRAW_COMPLEX
+static void map_blended(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                        const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa,
+                        const lv_opa_t * mask, lv_coord_t mask_stride, lv_blend_mode_t blend_mode);
+
+static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color_t bg, lv_opa_t opa);
+static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_color_t bg, lv_opa_t opa);
+static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color_t bg, lv_opa_t opa);
+#endif /*LV_DRAW_COMPLEX*/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+#if LV_COLOR_SCREEN_TRANSP == 0
+#define FILL_NORMAL_MASK_PX(color)                                                          \
+    if(*mask == LV_OPA_COVER) *dest_buf = color;                                 \
+    else *dest_buf = lv_color_mix(color, *dest_buf, *mask);            \
+    mask++;                                                         \
+    dest_buf++;
+
+#else
+#define FILL_NORMAL_MASK_PX(color)                                               \
+    if(*mask == LV_OPA_COVER) *dest_buf = color;                                 \
+    else if(disp->driver->screen_transp) lv_color_mix_with_alpha(*dest_buf, dest_buf->ch.alpha, color, *mask, dest_buf, &dest_buf->ch.alpha);           \
+    else *dest_buf = lv_color_mix(color, *dest_buf, *mask);            \
+    mask++;                                                         \
+    dest_buf++;
+#endif
+
+#define MAP_NORMAL_MASK_PX(x)                                                          \
+    if(*mask_tmp_x) {          \
+        if(*mask_tmp_x == LV_OPA_COVER) dest_buf[x] = src_buf[x];                                 \
+        else dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], *mask_tmp_x);            \
+    }                                                                                               \
+    mask_tmp_x++;
+
+#define MAP_NORMAL_MASK_PX_SCR_TRANSP(x)                        \
+    if(*mask_tmp_x) {          \
+        if(*mask_tmp_x == LV_OPA_COVER) dest_buf[x] = src_buf[x];                                 \
+        else if(disp->driver->screen_transp) lv_color_mix_with_alpha(dest_buf[x], dest_buf[x].ch.alpha,              \
+                                                                         src_buf[x], *mask_tmp_x, &dest_buf[x], &dest_buf[x].ch.alpha);                  \
+        else dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], *mask_tmp_x);            \
+    }                                                                                               \
+    mask_tmp_x++;
+
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sw_blend(lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc)
+{
+    /*Do not draw transparent things*/
+    if(dsc->opa <= LV_OPA_MIN) return;
+
+    lv_area_t blend_area;
+    if(!_lv_area_intersect(&blend_area, dsc->blend_area, draw_ctx->clip_area)) return;
+
+    if(draw_ctx->wait_for_finish) draw_ctx->wait_for_finish(draw_ctx);
+
+    ((lv_draw_sw_ctx_t *)draw_ctx)->blend(draw_ctx, dsc);
+}
+
+LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_blend_basic(lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc)
+{
+    const lv_opa_t * mask;
+    if(dsc->mask_buf == NULL) mask = NULL;
+    if(dsc->mask_buf && dsc->mask_res == LV_DRAW_MASK_RES_TRANSP) return;
+    else if(dsc->mask_res == LV_DRAW_MASK_RES_FULL_COVER) mask = NULL;
+    else mask = dsc->mask_buf;
+
+    lv_coord_t dest_stride = lv_area_get_width(draw_ctx->buf_area);
+
+    lv_area_t blend_area;
+    if(!_lv_area_intersect(&blend_area, dsc->blend_area, draw_ctx->clip_area)) return;
+
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+    lv_color_t * dest_buf = draw_ctx->buf;
+    if(disp->driver->set_px_cb == NULL) {
+        dest_buf += dest_stride * (blend_area.y1 - draw_ctx->buf_area->y1) + (blend_area.x1 - draw_ctx->buf_area->x1);
+    }
+
+    const lv_color_t * src_buf = dsc->src_buf;
+    lv_coord_t src_stride;
+    if(src_buf) {
+        src_stride = lv_area_get_width(dsc->blend_area);
+        src_buf += src_stride * (blend_area.y1 - dsc->blend_area->y1) + (blend_area.x1 - dsc->blend_area->x1);
+    }
+    else {
+        src_stride = 0;
+    }
+
+    lv_coord_t mask_stride;
+    if(mask) {
+        mask_stride = lv_area_get_width(dsc->mask_area);
+        mask += mask_stride * (dsc->mask_area->y1 - blend_area.y1) + (dsc->mask_area->x1 - blend_area.x1);
+    }
+    else {
+        mask_stride = 0;
+    }
+
+    lv_area_move(&blend_area, -draw_ctx->buf_area->x1, -draw_ctx->buf_area->y1);
+
+
+    if(disp->driver->set_px_cb) {
+        if(dsc->src_buf == NULL) {
+            fill_set_px(dest_buf, &blend_area, dest_stride, dsc->color, dsc->opa, mask, mask_stride);
+        }
+        else {
+            map_set_px(dest_buf, &blend_area, dest_stride, src_buf, src_stride, dsc->opa, mask, mask_stride);
+        }
+    }
+    else if(dsc->src_buf == NULL) {
+        if(dsc->blend_mode == LV_BLEND_MODE_NORMAL) {
+            fill_normal(dest_buf, &blend_area, dest_stride, dsc->color, dsc->opa, mask, mask_stride);
+        }
+#if LV_DRAW_COMPLEX
+        else {
+            fill_blended(dest_buf, &blend_area, dest_stride, dsc->color, dsc->opa, mask, mask_stride, dsc->blend_mode);
+        }
+#endif
+    }
+    else {
+        if(dsc->blend_mode == LV_BLEND_MODE_NORMAL) {
+            map_normal(dest_buf, &blend_area, dest_stride, src_buf, src_stride, dsc->opa, mask, mask_stride);
+        }
+#if LV_DRAW_COMPLEX
+        else {
+            map_blended(dest_buf, &blend_area, dest_stride, src_buf, src_stride, dsc->opa, mask, mask_stride, dsc->blend_mode);
+        }
+#endif
+    }
+}
+
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void fill_set_px(lv_color_t * dest_buf, const lv_area_t * blend_area, lv_coord_t dest_stride,
+                        lv_color_t color, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stide)
+{
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+
+    int32_t x;
+    int32_t y;
+
+    if(mask == NULL) {
+        for(y = blend_area->y1; y <= blend_area->y2; y++) {
+            for(x = blend_area->x1; x <= blend_area->x2; x++) {
+                disp->driver->set_px_cb(disp->driver, (void *)dest_buf, dest_stride, x, y, color, opa);
+            }
+        }
+    }
+    else {
+        int32_t w = lv_area_get_width(blend_area);
+        int32_t h = lv_area_get_height(blend_area);
+
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                if(mask[x]) {
+                    disp->driver->set_px_cb(disp->driver, (void *)dest_buf, dest_stride, blend_area->x1 + x, blend_area->y1 + y, color,
+                                            (uint32_t)((uint32_t)opa * mask[x]) >> 8);
+                }
+            }
+            mask += mask_stide;
+        }
+    }
+}
+
+LV_ATTRIBUTE_FAST_MEM static void fill_normal(lv_color_t * dest_buf, const lv_area_t * dest_area,
+                                              lv_coord_t dest_stride, lv_color_t color, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride)
+{
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+    int32_t w = lv_area_get_width(dest_area);
+    int32_t h = lv_area_get_height(dest_area);
+
+    int32_t x;
+    int32_t y;
+
+    /*No mask*/
+    if(mask == NULL) {
+        if(opa >= LV_OPA_MAX) {
+            for(y = 0; y < h; y++) {
+                lv_color_fill(dest_buf, color, w);
+                dest_buf += dest_stride;
+            }
+        }
+        /*Has opacity*/
+        else {
+            lv_color_t last_dest_color = lv_color_black();
+            lv_color_t last_res_color = lv_color_mix(color, last_dest_color, opa);
+
+            uint16_t color_premult[3];
+            lv_color_premult(color, opa, color_premult);
+            lv_opa_t opa_inv = 255 - opa;
+
+            for(y = 0; y < h; y++) {
+                for(x = 0; x < w; x++) {
+                    if(last_dest_color.full != dest_buf[x].full) {
+                        last_dest_color = dest_buf[x];
+
+#if LV_COLOR_SCREEN_TRANSP
+                        if(disp->driver->screen_transp) {
+                            lv_color_mix_with_alpha(dest_buf[x], dest_buf[x].ch.alpha, color, opa, &last_res_color,
+                                                    &last_res_color.ch.alpha);
+                        }
+                        else
+#else
+                        LV_UNUSED(disp);
+#endif
+                        {
+                            last_res_color = lv_color_mix_premult(color_premult, dest_buf[x], opa_inv);
+                        }
+                    }
+                    dest_buf[x] = last_res_color;
+                }
+                dest_buf += dest_stride;
+            }
+        }
+    }
+    /*Masked*/
+    else {
+#if LV_COLOR_DEPTH == 16
+        uint32_t c32 = color.full + ((uint32_t)color.full << 16);
+#endif
+        /*Only the mask matters*/
+        if(opa >= LV_OPA_MAX) {
+            int32_t x_end4 = w - 4;
+            for(y = 0; y < h; y++) {
+                for(x = 0; x < w && ((lv_uintptr_t)(mask) & 0x3); x++) {
+                    FILL_NORMAL_MASK_PX(color)
+                }
+
+                for(; x <= x_end4; x += 4) {
+                    uint32_t mask32 = *((uint32_t *)mask);
+                    if(mask32 == 0xFFFFFFFF) {
+#if LV_COLOR_DEPTH == 16
+                        if((lv_uintptr_t)dest_buf & 0x3) {
+                            *(dest_buf + 0) = color;
+                            uint32_t * d = (uint32_t *)(dest_buf + 1);
+                            *d = c32;
+                            *(dest_buf + 3) = color;
+                        }
+                        else {
+                            uint32_t * d = (uint32_t *)dest_buf;
+                            *d = c32;
+                            *(d + 1) = c32;
+                        }
+#else
+                        dest_buf[0] = color;
+                        dest_buf[1] = color;
+                        dest_buf[2] = color;
+                        dest_buf[3] = color;
+#endif
+                        dest_buf += 4;
+                        mask += 4;
+                    }
+                    else if(mask32) {
+                        FILL_NORMAL_MASK_PX(color)
+                        FILL_NORMAL_MASK_PX(color)
+                        FILL_NORMAL_MASK_PX(color)
+                        FILL_NORMAL_MASK_PX(color)
+                    }
+                    else {
+                        mask += 4;
+                        dest_buf += 4;
+                    }
+                }
+
+                for(; x < w ; x++) {
+                    FILL_NORMAL_MASK_PX(color)
+                }
+                dest_buf += (dest_stride - w);
+                mask += (mask_stride - w);
+            }
+        }
+        /*With opacity*/
+        else {
+            /*Buffer the result color to avoid recalculating the same color*/
+            lv_color_t last_dest_color;
+            lv_color_t last_res_color;
+            lv_opa_t last_mask = LV_OPA_TRANSP;
+            last_dest_color.full = dest_buf[0].full;
+            last_res_color.full = dest_buf[0].full;
+            lv_opa_t opa_tmp = LV_OPA_TRANSP;
+
+            for(y = 0; y < h; y++) {
+                for(x = 0; x < w; x++) {
+                    if(*mask) {
+                        if(*mask != last_mask) opa_tmp = *mask == LV_OPA_COVER ? opa :
+                                                             (uint32_t)((uint32_t)(*mask) * opa) >> 8;
+                        if(*mask != last_mask || last_dest_color.full != dest_buf[x].full) {
+#if LV_COLOR_SCREEN_TRANSP
+                            if(disp->driver->screen_transp) {
+                                lv_color_mix_with_alpha(dest_buf[x], dest_buf[x].ch.alpha, color, opa_tmp, &last_res_color,
+                                                        &last_res_color.ch.alpha);
+                            }
+                            else
+#endif
+                            {
+                                if(opa_tmp == LV_OPA_COVER) last_res_color = color;
+                                else last_res_color = lv_color_mix(color, dest_buf[x], opa_tmp);
+                            }
+                            last_mask = *mask;
+                            last_dest_color.full = dest_buf[x].full;
+                        }
+                        dest_buf[x] = last_res_color;
+                    }
+                    mask++;
+                }
+                dest_buf += dest_stride;
+                mask += (mask_stride - w);
+            }
+        }
+    }
+}
+
+#if LV_DRAW_COMPLEX
+static void fill_blended(lv_color_t * dest_buf, const lv_area_t * dest_area,
+                         lv_coord_t dest_stride, lv_color_t color, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride,
+                         lv_blend_mode_t blend_mode)
+{
+
+    int32_t w = lv_area_get_width(dest_area);
+    int32_t h = lv_area_get_height(dest_area);
+
+    int32_t x;
+    int32_t y;
+
+    lv_color_t (*blend_fp)(lv_color_t, lv_color_t, lv_opa_t);
+    switch(blend_mode) {
+        case LV_BLEND_MODE_ADDITIVE:
+            blend_fp = color_blend_true_color_additive;
+            break;
+        case LV_BLEND_MODE_SUBTRACTIVE:
+            blend_fp = color_blend_true_color_subtractive;
+            break;
+        case LV_BLEND_MODE_MULTIPLY:
+            blend_fp = color_blend_true_color_multiply;
+            break;
+        default:
+            LV_LOG_WARN("fill_blended: unsupported blend mode");
+            return;
+    }
+
+    /*Simple fill (maybe with opacity), no masking*/
+    if(mask == NULL) {
+        lv_color_t last_dest_color = dest_buf[0];
+        lv_color_t last_res_color = blend_fp(color, dest_buf[0], opa);
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                if(last_dest_color.full != dest_buf[x].full) {
+                    last_dest_color = dest_buf[x];
+                    last_res_color = blend_fp(color, dest_buf[x], opa);
+                }
+                dest_buf[x] = last_res_color;
+            }
+            dest_buf += dest_stride;
+        }
+    }
+    /*Masked*/
+    else {
+        /*Buffer the result color to avoid recalculating the same color*/
+        lv_color_t last_dest_color;
+        lv_color_t last_res_color;
+        lv_opa_t last_mask = LV_OPA_TRANSP;
+        last_dest_color = dest_buf[0];
+        lv_opa_t opa_tmp = mask[0] >= LV_OPA_MAX ? opa : (uint32_t)((uint32_t)mask[0] * opa) >> 8;
+        last_res_color = blend_fp(color, last_dest_color, opa_tmp);
+
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                if(mask[x] == 0) continue;
+                if(mask[x] != last_mask || last_dest_color.full != dest_buf[x].full) {
+                    opa_tmp = mask[x] >= LV_OPA_MAX ? opa : (uint32_t)((uint32_t)mask[x] * opa) >> 8;
+
+                    last_res_color = blend_fp(color, dest_buf[x], opa_tmp);
+                    last_mask = mask[x];
+                    last_dest_color.full = dest_buf[x].full;
+                }
+                dest_buf[x] = last_res_color;
+            }
+            dest_buf += dest_stride;
+            mask += mask_stride;
+        }
+    }
+}
+#endif
+
+static void map_set_px(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                       const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride)
+
+{
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+
+    int32_t w = lv_area_get_width(dest_area);
+    int32_t h = lv_area_get_height(dest_area);
+
+    int32_t x;
+    int32_t y;
+
+    if(mask == NULL) {
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                disp->driver->set_px_cb(disp->driver, (void *)dest_buf, dest_stride, dest_area->x1 + x, dest_area->y1 + y, src_buf[x],
+                                        opa);
+            }
+            src_buf += src_stride;
+        }
+    }
+    else {
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                if(mask[x]) {
+                    disp->driver->set_px_cb(disp->driver, (void *)dest_buf, dest_stride, dest_area->x1 + x, dest_area->y1 + y, src_buf[x],
+                                            (uint32_t)((uint32_t)opa * mask[x]) >> 8);
+                }
+            }
+            mask += mask_stride;
+            src_buf += src_stride;
+        }
+    }
+}
+
+LV_ATTRIBUTE_FAST_MEM static void map_normal(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                                             const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa, const lv_opa_t * mask, lv_coord_t mask_stride)
+
+{
+    int32_t w = lv_area_get_width(dest_area);
+    int32_t h = lv_area_get_height(dest_area);
+
+    int32_t x;
+    int32_t y;
+
+#if LV_COLOR_SCREEN_TRANSP
+    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
+#endif
+
+    /*Simple fill (maybe with opacity), no masking*/
+    if(mask == NULL) {
+        if(opa >= LV_OPA_MAX) {
+            for(y = 0; y < h; y++) {
+                lv_memcpy(dest_buf, src_buf, w * sizeof(lv_color_t));
+                dest_buf += dest_stride;
+                src_buf += src_stride;
+            }
+        }
+        else {
+            for(y = 0; y < h; y++) {
+                for(x = 0; x < w; x++) {
+#if LV_COLOR_SCREEN_TRANSP
+                    if(disp->driver->screen_transp) {
+                        lv_color_mix_with_alpha(dest_buf[x], dest_buf[x].ch.alpha, src_buf[x], opa, &dest_buf[x],
+                                                &dest_buf[x].ch.alpha);
+                    }
+                    else
+#endif
+                    {
+                        dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], opa);
+                    }
+                }
+                dest_buf += dest_stride;
+                src_buf += src_stride;
+            }
+        }
+    }
+    /*Masked*/
+    else {
+        /*Only the mask matters*/
+        if(opa > LV_OPA_MAX) {
+            int32_t x_end4 = w - 4;
+
+            for(y = 0; y < h; y++) {
+                const lv_opa_t * mask_tmp_x = mask;
+#if 0
+                for(x = 0; x < w; x++) {
+                    MAP_NORMAL_MASK_PX(x);
+                }
+#else
+                for(x = 0; x < w && ((lv_uintptr_t)mask_tmp_x & 0x3); x++) {
+#if LV_COLOR_SCREEN_TRANSP
+                    MAP_NORMAL_MASK_PX_SCR_TRANSP(x)
+#else
+                    MAP_NORMAL_MASK_PX(x)
+#endif
+                }
+
+                uint32_t * mask32 = (uint32_t *)mask_tmp_x;
+                for(; x < x_end4; x += 4) {
+                    if(*mask32) {
+                        if((*mask32) == 0xFFFFFFFF) {
+                            dest_buf[x] = src_buf[x];
+                            dest_buf[x + 1] = src_buf[x + 1];
+                            dest_buf[x + 2] = src_buf[x + 2];
+                            dest_buf[x + 3] = src_buf[x + 3];
+                        }
+                        else {
+                            mask_tmp_x = (const lv_opa_t *)mask32;
+#if LV_COLOR_SCREEN_TRANSP
+                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x)
+                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x + 1)
+                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x + 2)
+                            MAP_NORMAL_MASK_PX_SCR_TRANSP(x + 3)
+#else
+                            MAP_NORMAL_MASK_PX(x)
+                            MAP_NORMAL_MASK_PX(x + 1)
+                            MAP_NORMAL_MASK_PX(x + 2)
+                            MAP_NORMAL_MASK_PX(x + 3)
+#endif
+                        }
+                    }
+                    mask32++;
+                }
+
+                mask_tmp_x = (const lv_opa_t *)mask32;
+                for(; x < w ; x++) {
+#if LV_COLOR_SCREEN_TRANSP
+                    MAP_NORMAL_MASK_PX_SCR_TRANSP(x)
+#else
+                    MAP_NORMAL_MASK_PX(x)
+#endif
+                }
+#endif
+                dest_buf += dest_stride;
+                src_buf += src_stride;
+                mask += mask_stride;
+            }
+        }
+        /*Handle opa and mask values too*/
+        else {
+            for(y = 0; y < h; y++) {
+                for(x = 0; x < w; x++) {
+                    if(mask[x]) {
+                        lv_opa_t opa_tmp = mask[x] >= LV_OPA_MAX ? opa : ((opa * mask[x]) >> 8);
+#if LV_COLOR_SCREEN_TRANSP
+                        if(disp->driver->screen_transp) {
+                            lv_color_mix_with_alpha(dest_buf[x], dest_buf[x].ch.alpha, src_buf[x], opa_tmp,
+                                                    &dest_buf[x], &dest_buf[x].ch.alpha);
+                        }
+                        else
+#endif
+                        {
+                            dest_buf[x] = lv_color_mix(src_buf[x], dest_buf[x], opa_tmp);
+                        }
+                    }
+                }
+                dest_buf += dest_stride;
+                src_buf += src_stride;
+                mask += mask_stride;
+            }
+        }
+    }
+}
+#if LV_DRAW_COMPLEX
+static void map_blended(lv_color_t * dest_buf, const lv_area_t * dest_area, lv_coord_t dest_stride,
+                        const lv_color_t * src_buf, lv_coord_t src_stride, lv_opa_t opa,
+                        const lv_opa_t * mask, lv_coord_t mask_stride, lv_blend_mode_t blend_mode)
+{
+
+    int32_t w = lv_area_get_width(dest_area);
+    int32_t h = lv_area_get_height(dest_area);
+
+    int32_t x;
+    int32_t y;
+
+    lv_color_t (*blend_fp)(lv_color_t, lv_color_t, lv_opa_t);
+    switch(blend_mode) {
+        case LV_BLEND_MODE_ADDITIVE:
+            blend_fp = color_blend_true_color_additive;
+            break;
+        case LV_BLEND_MODE_SUBTRACTIVE:
+            blend_fp = color_blend_true_color_subtractive;
+            break;
+        case LV_BLEND_MODE_MULTIPLY:
+            blend_fp = color_blend_true_color_multiply;
+            break;
+        default:
+            LV_LOG_WARN("fill_blended: unsupported blend mode");
+            return;
+    }
+
+    /*Simple fill (maybe with opacity), no masking*/
+    if(mask == NULL) {
+        /*The map will be indexed from `draw_area->x1` so compensate it.*/
+
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                dest_buf[x] = blend_fp(src_buf[x], dest_buf[x], opa);
+            }
+            dest_buf += dest_stride;
+            src_buf += src_stride;
+        }
+    }
+    /*Masked*/
+    else {
+        for(y = 0; y < h; y++) {
+            for(x = 0; x < w; x++) {
+                if(mask[x] == 0) continue;
+                lv_opa_t opa_tmp = mask[x] >= LV_OPA_MAX ? opa : ((opa * mask[x]) >> 8);
+                dest_buf[x] = blend_fp(src_buf[x], dest_buf[x], opa_tmp);
+            }
+            dest_buf += dest_stride;
+            src_buf += src_stride;
+            mask += mask_stride;
+        }
+    }
+}
+
+static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color_t bg, lv_opa_t opa)
+{
+
+    if(opa <= LV_OPA_MIN) return bg;
+
+    uint32_t tmp;
+#if LV_COLOR_DEPTH == 1
+    tmp = bg.full + fg.full;
+    fg.full = LV_MIN(tmp, 1);
+#else
+    tmp = bg.ch.red + fg.ch.red;
+#if LV_COLOR_DEPTH == 8
+    fg.ch.red = LV_MIN(tmp, 7);
+#elif LV_COLOR_DEPTH == 16
+    fg.ch.red = LV_MIN(tmp, 31);
+#elif LV_COLOR_DEPTH == 32
+    fg.ch.red = LV_MIN(tmp, 255);
+#endif
+
+#if LV_COLOR_DEPTH == 8
+    tmp = bg.ch.green + fg.ch.green;
+    fg.ch.green = LV_MIN(tmp, 7);
+#elif LV_COLOR_DEPTH == 16
+#if LV_COLOR_16_SWAP == 0
+    tmp = bg.ch.green + fg.ch.green;
+    fg.ch.green = LV_MIN(tmp, 63);
+#else
+    tmp = (bg.ch.green_h << 3) + bg.ch.green_l + (fg.ch.green_h << 3) + fg.ch.green_l;
+    tmp = LV_MIN(tmp, 63);
+    fg.ch.green_h = tmp >> 3;
+    fg.ch.green_l = tmp & 0x7;
+#endif
+
+#elif LV_COLOR_DEPTH == 32
+    tmp = bg.ch.green + fg.ch.green;
+    fg.ch.green = LV_MIN(tmp, 255);
+#endif
+
+    tmp = bg.ch.blue + fg.ch.blue;
+#if LV_COLOR_DEPTH == 8
+    fg.ch.blue = LV_MIN(tmp, 4);
+#elif LV_COLOR_DEPTH == 16
+    fg.ch.blue = LV_MIN(tmp, 31);
+#elif LV_COLOR_DEPTH == 32
+    fg.ch.blue = LV_MIN(tmp, 255);
+#endif
+#endif
+
+    if(opa == LV_OPA_COVER) return fg;
+
+    return lv_color_mix(fg, bg, opa);
+}
+
+static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_color_t bg, lv_opa_t opa)
+{
+    if(opa <= LV_OPA_MIN) return bg;
+
+    int32_t tmp;
+    tmp = bg.ch.red - fg.ch.red;
+    fg.ch.red = LV_MAX(tmp, 0);
+
+#if LV_COLOR_16_SWAP == 0
+    tmp = bg.ch.green - fg.ch.green;
+    fg.ch.green = LV_MAX(tmp, 0);
+#else
+    tmp = (bg.ch.green_h << 3) + bg.ch.green_l + (fg.ch.green_h << 3) + fg.ch.green_l;
+    tmp = LV_MAX(tmp, 0);
+    fg.ch.green_h = tmp >> 3;
+    fg.ch.green_l = tmp & 0x7;
+#endif
+
+    tmp = bg.ch.blue - fg.ch.blue;
+    fg.ch.blue = LV_MAX(tmp, 0);
+
+    if(opa == LV_OPA_COVER) return fg;
+
+    return lv_color_mix(fg, bg, opa);
+}
+
+static inline lv_color_t color_blend_true_color_multiply(lv_color_t fg, lv_color_t bg, lv_opa_t opa)
+{
+    if(opa <= LV_OPA_MIN) return bg;
+
+#if LV_COLOR_DEPTH == 32
+    fg.ch.red = (fg.ch.red * bg.ch.red) >> 8;
+    fg.ch.green = (fg.ch.green * bg.ch.green) >> 8;
+    fg.ch.blue = (fg.ch.blue * bg.ch.blue) >> 8;
+#elif LV_COLOR_DEPTH == 16
+    fg.ch.red = (fg.ch.red * bg.ch.red) >> 5;
+    fg.ch.blue = (fg.ch.blue * bg.ch.blue) >> 5;
+    LV_COLOR_SET_G(fg, (LV_COLOR_GET_G(fg) * LV_COLOR_GET_G(bg)) >> 6);
+#elif LV_COLOR_DEPTH == 8
+    fg.ch.red = (fg.ch.red * bg.ch.red) >> 3;
+    fg.ch.green = (fg.ch.green * bg.ch.green) >> 3;
+    fg.ch.blue = (fg.ch.blue * bg.ch.blue) >> 2;
+#endif
+
+    if(opa == LV_OPA_COVER) return fg;
+
+    return lv_color_mix(fg, bg, opa);
+}
+
+#endif
+
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_blend.h b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_blend.h
new file mode 100644
index 000000000..9a00e533a
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_blend.h
@@ -0,0 +1,69 @@
+/**
+ * @file lv_draw_sw_blend.h
+ *
+ */
+
+#ifndef LV_DRAW_SW_BLEND_H
+#define LV_DRAW_SW_BLEND_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../misc/lv_color.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_style.h"
+#include "../lv_draw_mask.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    const lv_area_t * blend_area;   /**< The area with absolute coordinates to draw on `draw_ctx->buf`
+                                     *   will be clipped to `draw_ctx->clip_area` */
+    const lv_color_t * src_buf;     /**< Pointer to an image to blend. If set `fill_color` is ignored */
+    lv_color_t color;               /**< Fill color*/
+    lv_opa_t * mask_buf;            /**< NULL if ignored, or an alpha mask to apply on `blend_area`*/
+    lv_draw_mask_res_t mask_res;    /**< The result of the previous mask operation */
+    const lv_area_t * mask_area;    /**< The area of `mask_buf` with absolute coordinates*/
+    lv_opa_t opa;                   /**< The overall opacity*/
+    lv_blend_mode_t blend_mode;     /**< E.g. LV_BLEND_MODE_ADDITIVE*/
+} lv_draw_sw_blend_dsc_t;
+
+struct _lv_draw_ctx_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Call the blend function of the `draw_ctx`.
+ * @param draw_ctx      pointer to a draw context
+ * @param dsc           pointer to an initialized blend descriptor
+ */
+void lv_draw_sw_blend(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc);
+
+/**
+ * The basic blend function used with software rendering.
+ * @param draw_ctx      pointer to a draw context
+ * @param dsc           pointer to an initialized blend descriptor
+ */
+LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_blend_basic(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_sw_blend_dsc_t * dsc);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_SW_BLEND_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_dither.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_dither.c
new file mode 100644
index 000000000..ff9ebf3d3
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_dither.c
@@ -0,0 +1,213 @@
+/**
+ * @file lv_draw_sw_dither.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw_dither.h"
+#include "lv_draw_sw_gradient.h"
+#include "../../misc/lv_color.h"
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+
+#if _DITHER_GRADIENT
+
+LV_ATTRIBUTE_FAST_MEM void lv_dither_none(lv_grad_t * grad, lv_coord_t x, lv_coord_t y, lv_coord_t w)
+{
+    LV_UNUSED(x);
+    LV_UNUSED(y);
+    if(grad == NULL || grad->filled) return;
+    for(lv_coord_t i = 0; i < w; i++) {
+        grad->map[i] = lv_color_hex(grad->hmap[i].full);
+    }
+    grad->filled = 1;
+}
+
+static const uint8_t dither_ordered_threshold_matrix[8 * 8] = {
+    0,  48, 12, 60,  3, 51, 15, 63,
+    32, 16, 44, 28, 35, 19, 47, 31,
+    8,  56,  4, 52, 11, 59,  7, 55,
+    40, 24, 36, 20, 43, 27, 39, 23,
+    2,  50, 14, 62,  1, 49, 13, 61,
+    34, 18, 46, 30, 33, 17, 45, 29,
+    10, 58,  6, 54,  9, 57,  5, 53,
+    42, 26, 38, 22, 41, 25, 37, 21
+}; /* Shift by 6 to normalize */
+
+
+LV_ATTRIBUTE_FAST_MEM void lv_dither_ordered_hor(lv_grad_t * grad, lv_coord_t x, lv_coord_t y, lv_coord_t w)
+{
+    LV_UNUSED(x);
+    /* For vertical dithering, the error is spread on the next column (and not next line).
+       Since the renderer is scanline based, it's not obvious what could be used to perform the rendering efficiently.
+       The algorithm below is based on few assumptions:
+         1. An error diffusion algorithm (like Floyd Steinberg) here would be hard to implement since it means that a pixel on column n depends on the pixel on row n
+         2. Instead an ordered dithering algorithm shift the value a bit, but the influence only spread from the matrix size (used 8x8 here)
+         3. It means that a pixel i,j only depends on the value of a pixel i-7, j-7 to i,j and no other one.
+       Then we compute a complete row of ordered dither and store it in out. */
+
+    /*The apply the algorithm for this patch*/
+    for(lv_coord_t j = 0; j < w; j++) {
+        int8_t factor = dither_ordered_threshold_matrix[(y & 7) * 8 + ((j) & 7)] - 32;
+        lv_color32_t tmp = grad->hmap[LV_CLAMP(0, j - 4, grad->size)];
+        lv_color32_t t;
+        t.ch.red   = LV_CLAMP(0, tmp.ch.red + factor, 255);
+        t.ch.green = LV_CLAMP(0, tmp.ch.green + factor, 255);
+        t.ch.blue  = LV_CLAMP(0, tmp.ch.blue + factor, 255);
+
+        grad->map[j] = lv_color_hex(t.full);
+    }
+}
+LV_ATTRIBUTE_FAST_MEM void lv_dither_ordered_ver(lv_grad_t * grad, lv_coord_t x, lv_coord_t y, lv_coord_t w)
+{
+    /* For vertical dithering, the error is spread on the next column (and not next line).
+       Since the renderer is scanline based, it's not obvious what could be used to perform the rendering efficiently.
+       The algorithm below is based on few assumptions:
+         1. An error diffusion algorithm (like Floyd Steinberg) here would be hard to implement since it means that a pixel on column n depends on the pixel on row n
+         2. Instead an ordered dithering algorithm shift the value a bit, but the influence only spread from the matrix size (used 8x8 here)
+         3. It means that a pixel i,j only depends on the value of a pixel i-7, j-7 to i,j and no other one.
+       Then we compute a complete row of ordered dither and store it in out. */
+
+    /*Extract patch for working with, selected pseudo randomly*/
+    lv_color32_t tmp = grad->hmap[LV_CLAMP(0, y - 4, grad->size)];
+
+    /*The apply the algorithm for this patch*/
+    for(lv_coord_t j = 0; j < 8; j++) {
+        int8_t factor = dither_ordered_threshold_matrix[(y & 7) * 8 + ((j + x) & 7)] - 32;
+        lv_color32_t t;
+        t.ch.red   = LV_CLAMP(0, tmp.ch.red + factor, 255);
+        t.ch.green = LV_CLAMP(0, tmp.ch.green + factor, 255);
+        t.ch.blue  = LV_CLAMP(0, tmp.ch.blue + factor, 255);
+
+        grad->map[j] = lv_color_hex(t.full);
+    }
+    /*Finally fill the line*/
+    lv_coord_t j = 8;
+    for(; j < w - 8; j += 8) {
+        lv_memcpy(grad->map + j, grad->map, 8 * sizeof(*grad->map));
+    }
+    /* Prevent overwriting */
+    for(; j < w; j++) {
+        grad->map[j] = grad->map[j & 7];
+    }
+}
+
+
+#if LV_DITHER_ERROR_DIFFUSION == 1
+LV_ATTRIBUTE_FAST_MEM void lv_dither_err_diff_hor(lv_grad_t * grad, lv_coord_t xs, lv_coord_t y, lv_coord_t w)
+{
+    LV_UNUSED(xs);
+    LV_UNUSED(y);
+    LV_UNUSED(w);
+
+    /* Implement Floyd Steinberg algorithm, see https://surma.dev/things/ditherpunk/
+        Coefs are:   x 7
+                   3 5 1
+                   / 16
+        Can be implemented as:            x       (x<<3 - x)
+                              (x<<2 - x) (x<<2+x)   x
+    */
+    int coef[4] = {0, 0, 0, 0};
+#define FS_COMPUTE_ERROR(e) { coef[0] = (e<<3) - e; coef[1] = (e<<2) - e; coef[2] = (e<<2) + e; coef[3] = e; }
+#define FS_COMPONENTS(A, OP, B, C) A.ch.red = LV_CLAMP(0, A.ch.red OP B.r OP C.r, 255); A.ch.green = LV_CLAMP(0, A.ch.green OP B.g OP C.g, 255); A.ch.blue = LV_CLAMP(0, A.ch.blue OP B.b OP C.b, 255);
+#define FS_QUANT_ERROR(e, t, q) { lv_color32_t u; u.full = lv_color_to32(q); e.r = (int8_t)(t.ch.red - u.ch.red); e.g = (int8_t)(t.ch.green - u.ch.green); e.b = (int8_t)(t.ch.blue - u.ch.blue); }
+    lv_scolor24_t next_px_err = {0}, next_l = {0}, error;
+    /*First last pixel are not dithered */
+    grad->map[0] = lv_color_hex(grad->hmap[0].full);
+    for(lv_coord_t x = 1; x < grad->size - 1; x++) {
+        lv_color32_t t = grad->hmap[x];
+        lv_color_t q;
+        /*Add error term*/
+        FS_COMPONENTS(t, +, next_px_err, next_l);
+        next_l = grad->error_acc[x + 1];
+        /*Quantify*/
+        q = lv_color_hex(t.full);
+        /*Then compute error*/
+        FS_QUANT_ERROR(error, t, q);
+        /*Dither the error*/
+        FS_COMPUTE_ERROR(error.r);
+        next_px_err.r      = coef[0] >> 4;
+        grad->error_acc[x - 1].r += coef[1] >> 4;
+        grad->error_acc[x].r     += coef[2] >> 4;
+        grad->error_acc[x + 1].r = coef[3] >> 4;
+
+        FS_COMPUTE_ERROR(error.g);
+        next_px_err.g      = coef[0] >> 4;
+        grad->error_acc[x - 1].g += coef[1] >> 4;
+        grad->error_acc[x].g     += coef[2] >> 4;
+        grad->error_acc[x + 1].g = coef[3] >> 4;
+
+        FS_COMPUTE_ERROR(error.b);
+        next_px_err.b      = coef[0] >> 4;
+        grad->error_acc[x - 1].b += coef[1] >> 4;
+        grad->error_acc[x].b     += coef[2] >> 4;
+        grad->error_acc[x + 1].b = coef[3] >> 4;
+
+        grad->map[x] = q;
+    }
+    grad->map[grad->size - 1] = lv_color_hex(grad->hmap[grad->size - 1].full);
+}
+
+LV_ATTRIBUTE_FAST_MEM void lv_dither_err_diff_ver(lv_grad_t * grad, lv_coord_t xs, lv_coord_t y, lv_coord_t w)
+{
+    /* Try to implement error diffusion on a vertical gradient and an horizontal map using those tricks:
+        Since the given hi-resolution gradient (in src) is vertical, the Floyd Steinberg algorithm pass need to be rotated,
+        so we'll get this instead (from top to bottom):
+
+          A   B   C
+       1 [  ][  ][  ]
+       2 [  ][  ][  ]     Pixel A2 will spread its error on pixel A3 with coefficient 7,
+       3 [  ][  ][  ]     Pixel A2 will spread its error on pixel B1 with coefficient 3, B2 with coef 5 and B3 with coef 1
+
+       When taking into account an arbitrary pixel P(i,j), its added error diffusion term is:
+           e(i,j) = 1/16 * [ e(i-1,j) * 5 + e(i-1,j+1) * 3 + e(i-1,j-1) * 1 + e(i,j-1) * 7]
+
+       This means that the error term depends on pixel W, NW, N and SW.
+       If we consider that we are generating the error diffused gradient map from top to bottom, we can remember the previous
+       line (N, NW) in the term above. Also, we remember the (W) term too since we are computing the gradient map from left to right.
+       However, the SW term is painful for us, we can't support it (since to get it, we need its own SW term and so on).
+       Let's remove it and re-dispatch the error factor accordingly so they stays normalized:
+           e(i,j) ~= 1/16 * [ e(i-1,j) * 6 + e(i-1,j-1) * 1 + e(i,j-1) * 9]
+
+       That's the idea of this pseudo Floyd Steinberg dithering */
+#define FS_APPLY(d, s, c) d.r = (int8_t)(s.r * c) >> 4; d.g = (int8_t)(s.g * c) >> 4; d.b = (int8_t)(s.b * c) >> 4;
+#define FS_COMPONENTS3(A, OP, B, b, C, c, D, d) \
+    A.ch.red   = LV_CLAMP(0, A.ch.red   OP ((B.r * b OP C.r * c OP D.r * d) >> 4), 255); \
+    A.ch.green = LV_CLAMP(0, A.ch.green OP ((B.r * b OP C.r * c OP D.r * d) >> 4), 255); \
+    A.ch.blue  = LV_CLAMP(0, A.ch.blue  OP ((B.r * b OP C.r * c OP D.r * d) >> 4), 255);
+
+    lv_scolor24_t next_px_err, prev_l = grad->error_acc[0];
+    /*Compute the error term for the current pixel (first pixel is never dithered)*/
+    if(xs == 0) {
+        grad->map[0] = lv_color_hex(grad->hmap[y].full);
+        FS_QUANT_ERROR(next_px_err, grad->hmap[y], grad->map[0]);
+    }
+    else {
+        lv_color_t tmp = lv_color_hex(grad->hmap[y].full);
+        lv_color32_t t = grad->hmap[y];
+        FS_QUANT_ERROR(next_px_err, grad->hmap[y], tmp);
+        FS_COMPONENTS3(t, +, next_px_err, 6, prev_l, 1, grad->error_acc[0], 9);
+        grad->map[0] = lv_color_hex(t.full);
+    }
+
+    for(lv_coord_t x = 1; x < w; x++) {
+        lv_color32_t t = grad->hmap[y];
+        lv_color_t q;
+        /*Add the current error term*/
+        FS_COMPONENTS3(t, +, next_px_err, 6, prev_l, 1, grad->error_acc[x], 9);
+        prev_l = grad->error_acc[x];
+        /*Quantize and compute error term*/
+        q = lv_color_hex(t.full);
+        FS_QUANT_ERROR(next_px_err, t, q);
+        /*Store error for next line computation*/
+        grad->error_acc[x] = next_px_err;
+        grad->map[x] = q;
+    }
+}
+#endif
+#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_dither.h b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_dither.h
new file mode 100644
index 000000000..6362c5ac4
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_dither.h
@@ -0,0 +1,70 @@
+/**
+ * @file lv_draw_sw_dither.h
+ *
+ */
+
+#ifndef LV_DRAW_SW_DITHER_H
+#define LV_DRAW_SW_DITHER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../core/lv_obj_pos.h"
+
+
+/*********************
+ *      DEFINES
+ *********************/
+#if LV_COLOR_DEPTH < 32 && LV_DITHER_GRADIENT == 1
+#define _DITHER_GRADIENT 1
+#else
+#define _DITHER_GRADIENT 0
+#endif
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+#if _DITHER_GRADIENT
+/*A signed error color component*/
+typedef struct {
+    int8_t r, g, b;
+} lv_scolor24_t;
+
+struct _lv_gradient_cache_t;
+typedef void (*lv_dither_func_t)(struct _lv_gradient_cache_t * grad, lv_coord_t x, lv_coord_t y, lv_coord_t w);
+
+#endif
+
+
+/**********************
+ *    PROTOTYPES
+ **********************/
+#if LV_DRAW_COMPLEX
+#if _DITHER_GRADIENT
+LV_ATTRIBUTE_FAST_MEM void lv_dither_none(struct _lv_gradient_cache_t * grad, lv_coord_t x, lv_coord_t y, lv_coord_t w);
+
+LV_ATTRIBUTE_FAST_MEM void lv_dither_ordered_hor(struct _lv_gradient_cache_t * grad, const lv_coord_t xs,
+                                                 const lv_coord_t y, const lv_coord_t w);
+LV_ATTRIBUTE_FAST_MEM void lv_dither_ordered_ver(struct _lv_gradient_cache_t * grad, const lv_coord_t xs,
+                                                 const lv_coord_t y, const lv_coord_t w);
+
+#if LV_DITHER_ERROR_DIFFUSION == 1
+LV_ATTRIBUTE_FAST_MEM void lv_dither_err_diff_hor(struct _lv_gradient_cache_t * grad, const lv_coord_t xs,
+                                                  const lv_coord_t y, const lv_coord_t w);
+LV_ATTRIBUTE_FAST_MEM void lv_dither_err_diff_ver(struct _lv_gradient_cache_t * grad, const lv_coord_t xs,
+                                                  const lv_coord_t y, const lv_coord_t w);
+#endif /* LV_DITHER_ERROR_DIFFUSION */
+
+#endif /* _DITHER_GRADIENT */
+#endif
+
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_gradient.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_gradient.c
new file mode 100644
index 000000000..c5b32073e
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_gradient.c
@@ -0,0 +1,353 @@
+/**
+ * @file lv_draw_sw_gradient.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw_gradient.h"
+#include "../../misc/lv_gc.h"
+#include "../../misc/lv_types.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#if _DITHER_GRADIENT
+    #define GRAD_CM(r,g,b) LV_COLOR_MAKE32(r,g,b)
+    #define GRAD_CONV(t, x) t.full = lv_color_to32(x)
+#else
+    #define GRAD_CM(r,g,b) LV_COLOR_MAKE(r,g,b)
+    #define GRAD_CONV(t, x) t = x
+#endif
+
+#if defined(LV_ARCH_64)
+    #define ALIGN(X)    (((X) + 7) & ~7)
+#else
+    #define ALIGN(X)    (((X) + 3) & ~3)
+#endif
+
+#define MAX_WIN_RES     1024 /**TODO: Find a way to get this information: max(horz_res, vert_res)*/
+
+#if _DITHER_GRADIENT
+    #if LV_DITHER_ERROR_DIFFUSION == 1
+        #define LV_DEFAULT_GRAD_CACHE_SIZE  sizeof(lv_gradient_cache_t) + MAX_WIN_RES * sizeof(lv_grad_color_t) + MAX_WIN_RES * sizeof(lv_color_t) + MAX_WIN_RES * sizeof(lv_scolor24_t)
+    #else
+        #define LV_DEFAULT_GRAD_CACHE_SIZE  sizeof(lv_gradient_cache_t) + MAX_WIN_RES * sizeof(lv_grad_color_t) + MAX_WIN_RES * sizeof(lv_color_t)
+    #endif /* LV_DITHER_ERROR_DIFFUSION */
+#else
+    #define LV_DEFAULT_GRAD_CACHE_SIZE  sizeof(lv_gradient_cache_t) + MAX_WIN_RES * sizeof(lv_grad_color_t)
+#endif /* _DITHER_GRADIENT */
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static lv_grad_t * next_in_cache(lv_grad_t * item);
+
+typedef lv_res_t (*op_cache_t)(lv_grad_t * c, void * ctx);
+static lv_res_t iterate_cache(op_cache_t func, void * ctx, lv_grad_t ** out);
+static size_t get_cache_item_size(lv_grad_t * c);
+static lv_grad_t * allocate_item(const lv_grad_dsc_t * g, lv_coord_t w, lv_coord_t h);
+static lv_res_t find_oldest_item_life(lv_grad_t * c, void * ctx);
+static lv_res_t kill_oldest_item(lv_grad_t * c, void * ctx);
+static lv_res_t find_item(lv_grad_t * c, void * ctx);
+static void free_item(lv_grad_t * c);
+static  uint32_t compute_key(const lv_grad_dsc_t * g, lv_coord_t w, lv_coord_t h);
+
+
+/**********************
+ *   STATIC VARIABLE
+ **********************/
+static size_t    grad_cache_size = 0;
+static uint8_t * grad_cache_end = 0;
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+union void_cast {
+    const void * ptr;
+    const uint32_t value;
+};
+
+static uint32_t compute_key(const lv_grad_dsc_t * g, lv_coord_t size, lv_coord_t w)
+{
+    union void_cast v;
+    v.ptr = g;
+    return (v.value ^ size ^ (w >> 1)); /*Yes, this is correct, it's like a hash that changes if the width changes*/
+}
+
+static size_t get_cache_item_size(lv_grad_t * c)
+{
+    size_t s = ALIGN(sizeof(*c)) + ALIGN(c->alloc_size * sizeof(lv_color_t));
+#if _DITHER_GRADIENT
+    s += ALIGN(c->size * sizeof(lv_color32_t));
+#if LV_DITHER_ERROR_DIFFUSION == 1
+    s += ALIGN(c->w * sizeof(lv_scolor24_t));
+#endif
+#endif
+    return s;
+}
+
+static lv_grad_t * next_in_cache(lv_grad_t * item)
+{
+    if(grad_cache_size == 0) return NULL;
+
+    if(item == NULL)
+        return (lv_grad_t *)LV_GC_ROOT(_lv_grad_cache_mem);
+    if(item == NULL)
+        return NULL;
+
+    size_t s = get_cache_item_size(item);
+    /*Compute the size for this cache item*/
+    if((uint8_t *)item + s >= grad_cache_end) return NULL;
+    else return (lv_grad_t *)((uint8_t *)item + s);
+}
+
+static lv_res_t iterate_cache(op_cache_t func, void * ctx, lv_grad_t ** out)
+{
+    lv_grad_t * first = next_in_cache(NULL);
+    while(first != NULL && first->life) {
+        if((*func)(first, ctx) == LV_RES_OK) {
+            if(out != NULL) *out = first;
+            return LV_RES_OK;
+        }
+        first = next_in_cache(first);
+    }
+    return LV_RES_INV;
+}
+
+static lv_res_t find_oldest_item_life(lv_grad_t * c, void * ctx)
+{
+    uint32_t * min_life = (uint32_t *)ctx;
+    if(c->life < *min_life) *min_life = c->life;
+    return LV_RES_INV;
+}
+
+static void free_item(lv_grad_t * c)
+{
+    size_t size = get_cache_item_size(c);
+    size_t next_items_size = (size_t)(grad_cache_end - (uint8_t *)c) - size;
+    grad_cache_end -= size;
+    if(next_items_size) {
+        uint8_t * old = (uint8_t *)c;
+        lv_memcpy(c, ((uint8_t *)c) + size, next_items_size);
+        /* Then need to fix all internal pointers too */
+        while((uint8_t *)c != grad_cache_end) {
+            c->map = (lv_color_t *)(((uint8_t *)c->map) - size);
+#if _DITHER_GRADIENT
+            c->hmap = (lv_color32_t *)(((uint8_t *)c->hmap) - size);
+#if LV_DITHER_ERROR_DIFFUSION == 1
+            c->error_acc = (lv_scolor24_t *)(((uint8_t *)c->error_acc) - size);
+#endif
+#endif
+            c = (lv_grad_t *)(((uint8_t *)c) + get_cache_item_size(c));
+        }
+        lv_memset_00(old + next_items_size, size);
+    }
+}
+
+static lv_res_t kill_oldest_item(lv_grad_t * c, void * ctx)
+{
+    uint32_t * min_life = (uint32_t *)ctx;
+    if(c->life == *min_life) {
+        /*Found, let's kill it*/
+        free_item(c);
+        return LV_RES_OK;
+    }
+    return LV_RES_INV;
+}
+
+static lv_res_t find_item(lv_grad_t * c, void * ctx)
+{
+    uint32_t * k = (uint32_t *)ctx;
+    if(c->key == *k) return LV_RES_OK;
+    return LV_RES_INV;
+}
+
+static lv_grad_t * allocate_item(const lv_grad_dsc_t * g, lv_coord_t w, lv_coord_t h)
+{
+    lv_coord_t size = g->dir == LV_GRAD_DIR_HOR ? w : h;
+    lv_coord_t map_size = LV_MAX(w, h); /* The map is being used horizontally (width) unless
+                                           no dithering is selected where it's used vertically */
+
+    size_t req_size = ALIGN(sizeof(lv_grad_t)) + ALIGN(map_size * sizeof(lv_color_t));
+#if _DITHER_GRADIENT
+    req_size += ALIGN(size * sizeof(lv_color32_t));
+#if LV_DITHER_ERROR_DIFFUSION == 1
+    req_size += ALIGN(w * sizeof(lv_scolor24_t));
+#endif
+#endif
+
+    size_t act_size = (size_t)(grad_cache_end - LV_GC_ROOT(_lv_grad_cache_mem));
+    lv_grad_t * item = NULL;
+    if(req_size + act_size < grad_cache_size) {
+        item = (lv_grad_t *)grad_cache_end;
+        item->not_cached = 0;
+    }
+    else {
+        /*Need to evict items from cache until we find enough space to allocate this one */
+        if(req_size <= grad_cache_size) {
+            while(act_size + req_size > grad_cache_size) {
+                uint32_t oldest_life = UINT32_MAX;
+                iterate_cache(&find_oldest_item_life, &oldest_life, NULL);
+                iterate_cache(&kill_oldest_item, &oldest_life, NULL);
+                act_size = (size_t)(grad_cache_end - LV_GC_ROOT(_lv_grad_cache_mem));
+            }
+            item = (lv_grad_t *)grad_cache_end;
+            item->not_cached = 0;
+        }
+        else {
+            /*The cache is too small. Allocate the item manually and free it later.*/
+            item = lv_mem_alloc(req_size);
+            LV_ASSERT_MALLOC(item);
+            if(item == NULL) return NULL;
+            item->not_cached = 1;
+        }
+    }
+
+    item->key = compute_key(g, size, w);
+    item->life = 1;
+    item->filled = 0;
+    item->alloc_size = map_size;
+    item->size = size;
+    if(item->not_cached) {
+        uint8_t * p = (uint8_t *)item;
+        item->map = (lv_color_t *)(p + ALIGN(sizeof(*item)));
+#if _DITHER_GRADIENT
+        item->hmap = (lv_color32_t *)(p + ALIGN(sizeof(*item)) + ALIGN(map_size * sizeof(lv_color_t)));
+#if LV_DITHER_ERROR_DIFFUSION == 1
+        item->error_acc = (lv_scolor24_t *)(p + ALIGN(sizeof(*item)) + ALIGN(size * sizeof(lv_grad_color_t)) +
+                                            ALIGN(map_size * sizeof(lv_color_t)));
+        item->w = w;
+#endif
+#endif
+    }
+    else {
+        item->map = (lv_color_t *)(grad_cache_end + ALIGN(sizeof(*item)));
+#if _DITHER_GRADIENT
+        item->hmap = (lv_color32_t *)(grad_cache_end + ALIGN(sizeof(*item)) + ALIGN(map_size * sizeof(lv_color_t)));
+#if LV_DITHER_ERROR_DIFFUSION == 1
+        item->error_acc = (lv_scolor24_t *)(grad_cache_end + ALIGN(sizeof(*item)) + ALIGN(size * sizeof(lv_grad_color_t)) +
+                                            ALIGN(map_size * sizeof(lv_color_t)));
+        item->w = w;
+#endif
+#endif
+        grad_cache_end += req_size;
+    }
+    return item;
+}
+
+
+/**********************
+ *     FUNCTIONS
+ **********************/
+void lv_gradient_free_cache(void)
+{
+    lv_mem_free(LV_GC_ROOT(_lv_grad_cache_mem));
+    LV_GC_ROOT(_lv_grad_cache_mem) = grad_cache_end = NULL;
+    grad_cache_size = 0;
+}
+
+void lv_gradient_set_cache_size(size_t max_bytes)
+{
+    lv_mem_free(LV_GC_ROOT(_lv_grad_cache_mem));
+    grad_cache_end = LV_GC_ROOT(_lv_grad_cache_mem) = lv_mem_alloc(max_bytes);
+    LV_ASSERT_MALLOC(LV_GC_ROOT(_lv_grad_cache_mem));
+    lv_memset_00(LV_GC_ROOT(_lv_grad_cache_mem), max_bytes);
+    grad_cache_size = max_bytes;
+}
+
+lv_grad_t * lv_gradient_get(const lv_grad_dsc_t * g, lv_coord_t w, lv_coord_t h)
+{
+    /* No gradient, no cache */
+    if(g->dir == LV_GRAD_DIR_NONE) return NULL;
+
+    /* Step 0: Check if the cache exist (else create it) */
+    static bool inited = false;
+    if(!inited) {
+        lv_gradient_set_cache_size(LV_GRAD_CACHE_DEF_SIZE);
+        inited = true;
+    }
+
+    /* Step 1: Search cache for the given key */
+    lv_coord_t size = g->dir == LV_GRAD_DIR_HOR ? w : h;
+    uint32_t key = compute_key(g, size, w);
+    lv_grad_t * item = NULL;
+    if(iterate_cache(&find_item, &key, &item) == LV_RES_OK) {
+        item->life++; /* Don't forget to bump the counter */
+        return item;
+    }
+
+    /* Step 2: Need to allocate an item for it */
+    item = allocate_item(g, w, h);
+    if(item == NULL) {
+        LV_LOG_WARN("Faild to allcoate item for teh gradient");
+        return item;
+    }
+
+    /* Step 3: Fill it with the gradient, as expected */
+#if _DITHER_GRADIENT
+    for(lv_coord_t i = 0; i < item->size; i++) {
+        item->hmap[i] = lv_gradient_calculate(g, item->size, i);
+    }
+#if LV_DITHER_ERROR_DIFFUSION == 1
+    lv_memset_00(item->error_acc, w * sizeof(lv_scolor24_t));
+#endif
+#else
+    for(lv_coord_t i = 0; i < item->size; i++) {
+        item->map[i] = lv_gradient_calculate(g, item->size, i);
+    }
+#endif
+
+    return item;
+}
+
+LV_ATTRIBUTE_FAST_MEM lv_grad_color_t lv_gradient_calculate(const lv_grad_dsc_t * dsc, lv_coord_t range,
+                                                            lv_coord_t frac)
+{
+    lv_grad_color_t tmp;
+    lv_color32_t one, two;
+    /*Clip out-of-bounds first*/
+    int32_t min = (dsc->stops[0].frac * range) >> 8;
+    if(frac <= min) {
+        GRAD_CONV(tmp, dsc->stops[0].color);
+        return tmp;
+    }
+
+    int32_t max = (dsc->stops[dsc->stops_count - 1].frac * range) >> 8;
+    if(frac >= max) {
+        GRAD_CONV(tmp, dsc->stops[dsc->stops_count - 1].color);
+        return tmp;
+    }
+
+    /*Find the 2 closest stop now*/
+    int32_t d = 0;
+    for(uint8_t i = 1; i < dsc->stops_count; i++) {
+        int32_t cur = (dsc->stops[i].frac * range) >> 8;
+        if(frac <= cur) {
+            one.full = lv_color_to32(dsc->stops[i - 1].color);
+            two.full = lv_color_to32(dsc->stops[i].color);
+            min = (dsc->stops[i - 1].frac * range) >> 8;
+            max = (dsc->stops[i].frac * range) >> 8;
+            d = max - min;
+            break;
+        }
+    }
+
+    /*Then interpolate*/
+    frac -= min;
+    lv_opa_t mix = (frac * 255) / d;
+    lv_opa_t imix = 255 - mix;
+
+    lv_grad_color_t r = GRAD_CM(LV_UDIV255(two.ch.red * mix   + one.ch.red * imix),
+                                LV_UDIV255(two.ch.green * mix + one.ch.green * imix),
+                                LV_UDIV255(two.ch.blue * mix  + one.ch.blue * imix));
+    return r;
+}
+
+void lv_gradient_cleanup(lv_grad_t * grad)
+{
+    if(grad->not_cached) {
+        lv_mem_free(grad);
+    }
+}
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_gradient.h b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_gradient.h
new file mode 100644
index 000000000..f5f3215ce
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_gradient.h
@@ -0,0 +1,97 @@
+/**
+ * @file lv_draw_sw_gradient.h
+ *
+ */
+
+#ifndef LV_DRAW_SW_GRADIENT_H
+#define LV_DRAW_SW_GRADIENT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../misc/lv_color.h"
+#include "../../misc/lv_style.h"
+#include "lv_draw_sw_dither.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#if LV_GRADIENT_MAX_STOPS < 2
+#error LVGL needs at least 2 stops for gradients. Please increase the LV_GRADIENT_MAX_STOPS
+#endif
+
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+#if _DITHER_GRADIENT
+typedef lv_color32_t lv_grad_color_t;
+#else
+typedef lv_color_t lv_grad_color_t;
+#endif
+
+/** To avoid recomputing gradient for each draw operation,
+ *  it's possible to cache the computation in this structure instance.
+ *  Whenever possible, this structure is reused instead of recomputing the gradient map */
+typedef struct _lv_gradient_cache_t {
+    uint32_t        key;          /**< A discriminating key that's built from the drawing operation.
+                                   * If the key does not match, the cache item is not used */
+    uint32_t        life : 30;    /**< A life counter that's incremented on usage. Higher counter is
+                                   * less likely to be evicted from the cache */
+    uint32_t        filled : 1;   /**< Used to skip dithering in it if already done */
+    uint32_t        not_cached: 1; /**< The cache was too small so this item is not managed by the cache*/
+    lv_color_t   *  map;          /**< The computed gradient low bitdepth color map, points into the
+                                   * cache's buffer, no free needed */
+    lv_coord_t      alloc_size;   /**< The map allocated size in colors */
+    lv_coord_t      size;         /**< The computed gradient color map size, in colors */
+#if _DITHER_GRADIENT
+    lv_color32_t  * hmap;         /**< If dithering, we need to store the current, high bitdepth gradient
+                                   * map too, points to the cache's buffer, no free needed */
+#if LV_DITHER_ERROR_DIFFUSION == 1
+    lv_scolor24_t * error_acc;    /**< Error diffusion dithering algorithm requires storing the last error
+                                   * drawn, points to the cache's buffer, no free needed  */
+    lv_coord_t      w;            /**< The error array width in pixels */
+#endif
+#endif
+} lv_grad_t;
+
+
+/**********************
+ *      PROTOTYPES
+ **********************/
+/** Compute the color in the given gradient and fraction
+ *  Gradient are specified in a virtual [0-255] range, so this function scales the virtual range to the given range
+ * @param dsc       The gradient descriptor to use
+ * @param range     The range to use in computation.
+ * @param frac      The current part used in the range. frac is in [0; range]
+ */
+LV_ATTRIBUTE_FAST_MEM lv_grad_color_t lv_gradient_calculate(const lv_grad_dsc_t * dsc, lv_coord_t range,
+                                                            lv_coord_t frac);
+
+/**
+ * Set the gradient cache size
+ * @param max_bytes Max cahce size
+ */
+void lv_gradient_set_cache_size(size_t max_bytes);
+
+/** Free the gradient cache */
+void lv_gradient_free_cache(void);
+
+/** Get a gradient cache from the given parameters */
+lv_grad_t * lv_gradient_get(const lv_grad_dsc_t * gradient, lv_coord_t w, lv_coord_t h);
+
+/**
+ * Clean up the gradient item after it was get with `lv_grad_get_from_cache`.
+ * @param grad      pointer to a gradient
+ */
+void lv_gradient_cleanup(lv_grad_t * grad);
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_DRAW_GRADIENT_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_img.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_img.c
new file mode 100644
index 000000000..76c308419
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_img.c
@@ -0,0 +1,321 @@
+/**
+ * @file lv_draw_img.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw.h"
+#include "../lv_img_cache.h"
+#include "../../hal/lv_hal_disp.h"
+#include "../../misc/lv_log.h"
+#include "../../core/lv_refr.h"
+#include "../../misc/lv_mem.h"
+#include "../../misc/lv_math.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_img_decoded(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * draw_dsc,
+                                                  const lv_area_t * coords, const uint8_t * src_buf, lv_img_cf_t cf)
+{
+    /*Use the clip area as draw area*/
+    lv_area_t draw_area;
+    lv_area_copy(&draw_area, draw_ctx->clip_area);
+
+    bool mask_any = lv_draw_mask_is_any(&draw_area);
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.opa = draw_dsc->opa;
+    blend_dsc.blend_mode = draw_dsc->blend_mode;
+
+    /*The simplest case just copy the pixels into the draw_buf*/
+    if(!mask_any && draw_dsc->angle == 0 && draw_dsc->zoom == LV_IMG_ZOOM_NONE &&
+       cf == LV_IMG_CF_TRUE_COLOR && draw_dsc->recolor_opa == LV_OPA_TRANSP) {
+        blend_dsc.blend_area = coords;
+        blend_dsc.src_buf = (const lv_color_t *)src_buf;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+    /*In the other cases every pixel need to be checked one-by-one*/
+    else {
+        //#if LV_DRAW_COMPLEX
+        /*The pixel size in byte is different if an alpha byte is added too*/
+        uint8_t px_size_byte = cf == LV_IMG_CF_TRUE_COLOR_ALPHA ? LV_IMG_PX_SIZE_ALPHA_BYTE : sizeof(lv_color_t);
+
+        /*Go to the first displayed pixel of the map*/
+        int32_t src_stride = lv_area_get_width(coords);
+
+        lv_color_t c;
+        lv_color_t chroma_keyed_color = LV_COLOR_CHROMA_KEY;
+        uint32_t px_i = 0;
+
+        const uint8_t * map_px;
+
+        lv_coord_t draw_area_h = lv_area_get_height(&draw_area);
+        lv_coord_t draw_area_w = lv_area_get_width(&draw_area);
+
+        lv_area_t blend_area;
+        blend_area.x1 = draw_area.x1;
+        blend_area.x2 = draw_area.x2;
+        blend_area.y1 = draw_area.y1;
+        blend_area.y2 = blend_area.y1;
+        blend_dsc.blend_area = &blend_area;
+
+        bool transform = draw_dsc->angle != 0 || draw_dsc->zoom != LV_IMG_ZOOM_NONE ? true : false;
+        /*Simple ARGB image. Handle it as special case because it's very common*/
+        if(!mask_any && !transform && cf == LV_IMG_CF_TRUE_COLOR_ALPHA && draw_dsc->recolor_opa == LV_OPA_TRANSP) {
+            uint32_t hor_res = (uint32_t) lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
+            uint32_t mask_buf_size = lv_area_get_size(&draw_area) > (uint32_t) hor_res ? hor_res : lv_area_get_size(&draw_area);
+            lv_color_t * src_buf_rgb = lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t));
+            lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
+            blend_dsc.mask_buf = mask_buf;
+            blend_dsc.mask_area = &blend_area;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+            blend_dsc.src_buf = src_buf_rgb;
+
+            const uint8_t * src_buf_tmp = src_buf;
+            src_buf_tmp += src_stride * (draw_area.y1 - coords->y1) * px_size_byte;
+            src_buf_tmp += (draw_area.x1 - coords->x1) * px_size_byte;
+
+            int32_t x;
+            int32_t y;
+            for(y = 0; y < draw_area_h; y++) {
+                map_px = src_buf_tmp;
+                for(x = 0; x < draw_area_w; x++, map_px += px_size_byte, px_i++) {
+                    lv_opa_t px_opa = map_px[LV_IMG_PX_SIZE_ALPHA_BYTE - 1];
+                    mask_buf[px_i] = px_opa;
+                    if(px_opa) {
+#if LV_COLOR_DEPTH == 8 || LV_COLOR_DEPTH == 1
+                        src_buf_rgb[px_i].full = map_px[0];
+#elif LV_COLOR_DEPTH == 16
+                        src_buf_rgb[px_i].full = map_px[0] + (map_px[1] << 8);
+#elif LV_COLOR_DEPTH == 32
+                        src_buf_rgb[px_i].full = *((uint32_t *)map_px);
+#endif
+                    }
+#if LV_COLOR_DEPTH == 32
+                    src_buf_rgb[px_i].ch.alpha = 0xFF;
+#endif
+                }
+
+                src_buf_tmp += src_stride * px_size_byte;
+                if(px_i + draw_area_w <= mask_buf_size) {
+                    blend_area.y2 ++;
+                }
+                else {
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+                    blend_area.y1 = blend_area.y2 + 1;
+                    blend_area.y2 = blend_area.y1;
+
+                    px_i = 0;
+                }
+            }
+            /*Flush the last part*/
+            if(blend_area.y1 != blend_area.y2) {
+                blend_area.y2--;
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+
+            lv_mem_buf_release(mask_buf);
+            lv_mem_buf_release(src_buf_rgb);
+        }
+        /*Most complicated case: transform or other mask or chroma keyed*/
+        else {
+            /*Build the image and a mask line-by-line*/
+            uint32_t hor_res = (uint32_t) lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
+            uint32_t mask_buf_size = lv_area_get_size(&draw_area) > hor_res ? hor_res : lv_area_get_size(&draw_area);
+            lv_color_t * src_buf_rgb = lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t));
+            lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
+            blend_dsc.mask_buf = mask_buf;
+            blend_dsc.mask_area = &blend_area;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+            blend_dsc.src_buf = src_buf_rgb;
+
+            const uint8_t * src_buf_tmp = NULL;
+#if LV_DRAW_COMPLEX
+            lv_img_transform_dsc_t trans_dsc;
+            lv_memset_00(&trans_dsc, sizeof(lv_img_transform_dsc_t));
+            if(transform) {
+                trans_dsc.cfg.angle = draw_dsc->angle;
+                trans_dsc.cfg.zoom = draw_dsc->zoom;
+                trans_dsc.cfg.src = src_buf;
+                trans_dsc.cfg.src_w = src_stride;
+                trans_dsc.cfg.src_h = lv_area_get_height(coords);
+                trans_dsc.cfg.cf = cf;
+                trans_dsc.cfg.pivot_x = draw_dsc->pivot.x;
+                trans_dsc.cfg.pivot_y = draw_dsc->pivot.y;
+                trans_dsc.cfg.color = draw_dsc->recolor;
+                trans_dsc.cfg.antialias = draw_dsc->antialias;
+
+                _lv_img_buf_transform_init(&trans_dsc);
+            }
+            else {
+                src_buf_tmp = src_buf;
+                src_buf_tmp += src_stride * (draw_area.y1 - coords->y1) * px_size_byte;
+                src_buf_tmp += (draw_area.x1 - coords->x1) * px_size_byte;
+            }
+#endif
+            uint16_t recolor_premult[3] = {0};
+            lv_opa_t recolor_opa_inv = 255 - draw_dsc->recolor_opa;
+            if(draw_dsc->recolor_opa != 0) {
+                lv_color_premult(draw_dsc->recolor, draw_dsc->recolor_opa, recolor_premult);
+            }
+
+            blend_dsc.mask_res = (cf != LV_IMG_CF_TRUE_COLOR || draw_dsc->angle ||
+                                  draw_dsc->zoom != LV_IMG_ZOOM_NONE) ? LV_DRAW_MASK_RES_CHANGED : LV_DRAW_MASK_RES_FULL_COVER;
+
+            /*Prepare the `mask_buf`if there are other masks*/
+            if(mask_any) {
+                lv_memset_ff(mask_buf, mask_buf_size);
+            }
+
+            int32_t x;
+            int32_t y;
+#if LV_DRAW_COMPLEX
+            int32_t rot_y = blend_area.y1 - coords->y1;
+#endif
+            for(y = 0; y < draw_area_h; y++) {
+                map_px = src_buf_tmp;
+#if LV_DRAW_COMPLEX
+                uint32_t px_i_start = px_i;
+                int32_t rot_x = blend_area.x1 - coords->x1;
+#endif
+
+                for(x = 0; x < draw_area_w; x++, px_i++, map_px += px_size_byte) {
+
+#if LV_DRAW_COMPLEX
+                    if(transform) {
+
+                        /*Transform*/
+                        bool ret;
+                        ret = _lv_img_buf_transform(&trans_dsc, rot_x + x, rot_y + y);
+                        if(ret == false) {
+                            mask_buf[px_i] = LV_OPA_TRANSP;
+                            continue;
+                        }
+                        else {
+                            mask_buf[px_i] = trans_dsc.res.opa;
+                            c.full = trans_dsc.res.color.full;
+                        }
+                    }
+                    /*No transform*/
+                    else
+#endif
+                    {
+                        if(cf == LV_IMG_CF_TRUE_COLOR_ALPHA) {
+                            lv_opa_t px_opa = map_px[LV_IMG_PX_SIZE_ALPHA_BYTE - 1];
+                            mask_buf[px_i] = px_opa;
+                            if(px_opa == 0) {
+#if  LV_COLOR_DEPTH == 32
+                                src_buf_rgb[px_i].full = 0;
+#endif
+                                continue;
+                            }
+                        }
+                        else {
+                            mask_buf[px_i] = 0xFF;
+                        }
+
+#if LV_COLOR_DEPTH == 1
+                        c.full = map_px[0];
+#elif LV_COLOR_DEPTH == 8
+                        c.full = map_px[0];
+#elif LV_COLOR_DEPTH == 16
+                        c.full = map_px[0] + (map_px[1] << 8);
+#elif LV_COLOR_DEPTH == 32
+                        c.full = *((uint32_t *)map_px);
+                        c.ch.alpha = 0xFF;
+#endif
+                        if(cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED) {
+                            if(c.full == chroma_keyed_color.full) {
+                                mask_buf[px_i] = LV_OPA_TRANSP;
+#if  LV_COLOR_DEPTH == 32
+                                src_buf_rgb[px_i].full = 0;
+#endif
+                                continue;
+                            }
+                        }
+
+                    }
+                    if(draw_dsc->recolor_opa != 0) {
+                        c = lv_color_mix_premult(recolor_premult, c, recolor_opa_inv);
+                    }
+
+                    src_buf_rgb[px_i].full = c.full;
+                }
+#if LV_DRAW_COMPLEX
+                /*Apply the masks if any*/
+                if(mask_any) {
+                    lv_draw_mask_res_t mask_res_sub;
+                    mask_res_sub = lv_draw_mask_apply(mask_buf + px_i_start, blend_area.x1,
+                                                      y + draw_area.y1, draw_area_w);
+                    if(mask_res_sub == LV_DRAW_MASK_RES_TRANSP) {
+                        lv_memset_00(mask_buf + px_i_start, draw_area_w);
+                        blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                    }
+                    else if(mask_res_sub == LV_DRAW_MASK_RES_CHANGED) {
+                        blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                    }
+                }
+#endif
+
+                src_buf_tmp += src_stride * px_size_byte;
+                if(px_i + draw_area_w < mask_buf_size) {
+                    blend_area.y2 ++;
+                }
+                else {
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+                    blend_area.y1 = blend_area.y2 + 1;
+                    blend_area.y2 = blend_area.y1;
+
+                    px_i = 0;
+                    blend_dsc.mask_res = (cf != LV_IMG_CF_TRUE_COLOR || draw_dsc->angle ||
+                                          draw_dsc->zoom != LV_IMG_ZOOM_NONE) ? LV_DRAW_MASK_RES_CHANGED : LV_DRAW_MASK_RES_FULL_COVER;
+
+                    /*Prepare the `mask_buf`if there are other masks*/
+                    if(mask_any) {
+                        lv_memset_ff(mask_buf, mask_buf_size);
+                    }
+                }
+            }
+
+            /*Flush the last part*/
+            if(blend_area.y1 != blend_area.y2) {
+                blend_area.y2--;
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+
+            lv_mem_buf_release(mask_buf);
+            lv_mem_buf_release(src_buf_rgb);
+        }
+    }
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_letter.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_letter.c
new file mode 100644
index 000000000..e7578cffb
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_letter.c
@@ -0,0 +1,536 @@
+/**
+ * @file lv_draw_sw_letter.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw.h"
+#include "../../hal/lv_hal_disp.h"
+#include "../../misc/lv_math.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_style.h"
+#include "../../font/lv_font.h"
+#include "../../core/lv_refr.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,
+                                                     const lv_point_t * pos, lv_font_glyph_dsc_t * g, const uint8_t * map_p);
+
+
+#if LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX
+static void draw_letter_subpx(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc, const lv_point_t * pos,
+                              lv_font_glyph_dsc_t * g, const uint8_t * map_p);
+#endif /*LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX*/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *  GLOBAL VARIABLES
+ **********************/
+
+const uint8_t _lv_bpp1_opa_table[2]  = {0, 255};          /*Opacity mapping with bpp = 1 (Just for compatibility)*/
+const uint8_t _lv_bpp2_opa_table[4]  = {0, 85, 170, 255}; /*Opacity mapping with bpp = 2*/
+
+const uint8_t _lv_bpp3_opa_table[8]  = {0, 36,  73, 109,   /*Opacity mapping with bpp = 3*/
+                                        146, 182,  219, 255
+                                       };
+
+const uint8_t _lv_bpp4_opa_table[16] = {0,  17, 34,  51,  /*Opacity mapping with bpp = 4*/
+                                        68, 85, 102, 119,
+                                        136, 153, 170, 187,
+                                        204, 221, 238, 255
+                                       };
+
+const uint8_t _lv_bpp8_opa_table[256] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+                                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+                                         32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+                                         48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+                                         64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+                                         80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+                                         96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+                                         112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+                                         128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+                                         144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+                                         160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+                                         176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+                                         192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+                                         208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+                                         224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+                                         240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+                                        };
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Draw a letter in the Virtual Display Buffer
+ * @param pos_p left-top coordinate of the latter
+ * @param mask_p the letter will be drawn only on this area  (truncated to draw_buf area)
+ * @param font_p pointer to font
+ * @param letter a letter to draw
+ * @param color color of letter
+ * @param opa opacity of letter (0..255)
+ */
+void lv_draw_sw_letter(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,  const lv_point_t * pos_p,
+                       uint32_t letter)
+{
+    lv_font_glyph_dsc_t g;
+    bool g_ret = lv_font_get_glyph_dsc(dsc->font, &g, letter, '\0');
+    if(g_ret == false)  {
+        /*Add warning if the dsc is not found
+         *but do not print warning for non printable ASCII chars (e.g. '\n')*/
+        if(letter >= 0x20 &&
+           letter != 0xf8ff && /*LV_SYMBOL_DUMMY*/
+           letter != 0x200c) { /*ZERO WIDTH NON-JOINER*/
+            LV_LOG_WARN("lv_draw_letter: glyph dsc. not found for U+%X", (unsigned int)letter);
+        }
+        return;
+    }
+
+    /*Don't draw anything if the character is empty. E.g. space*/
+    if((g.box_h == 0) || (g.box_w == 0)) return;
+
+    lv_point_t gpos;
+    gpos.x = pos_p->x + g.ofs_x;
+    gpos.y = pos_p->y + (dsc->font->line_height - dsc->font->base_line) - g.box_h - g.ofs_y;
+
+    /*If the letter is completely out of mask don't draw it*/
+    if(gpos.x + g.box_w < draw_ctx->clip_area->x1 ||
+       gpos.x > draw_ctx->clip_area->x2 ||
+       gpos.y + g.box_h < draw_ctx->clip_area->y1 ||
+       gpos.y > draw_ctx->clip_area->y2)  {
+        return;
+    }
+
+    const uint8_t * map_p = lv_font_get_glyph_bitmap(g.resolved_font, letter);
+    if(map_p == NULL) {
+        LV_LOG_WARN("lv_draw_letter: character's bitmap not found");
+        return;
+    }
+
+    if(g.resolved_font->subpx) {
+#if LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX
+        draw_letter_subpx(draw_ctx, dsc, &gpos, &g, map_p);
+#else
+        LV_LOG_WARN("Can't draw sub-pixel rendered letter because LV_USE_FONT_SUBPX == 0 in lv_conf.h");
+#endif
+    }
+    else {
+        draw_letter_normal(draw_ctx, dsc, &gpos, &g, map_p);
+    }
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc,
+                                                     const lv_point_t * pos, lv_font_glyph_dsc_t * g, const uint8_t * map_p)
+{
+
+    const uint8_t * bpp_opa_table_p;
+    uint32_t bitmask_init;
+    uint32_t bitmask;
+    uint32_t bpp = g->bpp;
+    lv_opa_t opa = dsc->opa;
+    uint32_t shades;
+    if(bpp == 3) bpp = 4;
+
+    switch(bpp) {
+        case 1:
+            bpp_opa_table_p = _lv_bpp1_opa_table;
+            bitmask_init  = 0x80;
+            shades = 2;
+            break;
+        case 2:
+            bpp_opa_table_p = _lv_bpp2_opa_table;
+            bitmask_init  = 0xC0;
+            shades = 4;
+            break;
+        case 4:
+            bpp_opa_table_p = _lv_bpp4_opa_table;
+            bitmask_init  = 0xF0;
+            shades = 16;
+            break;
+        case 8:
+            bpp_opa_table_p = _lv_bpp8_opa_table;
+            bitmask_init  = 0xFF;
+            shades = 256;
+            break;       /*No opa table, pixel value will be used directly*/
+        default:
+            LV_LOG_WARN("lv_draw_letter: invalid bpp");
+            return; /*Invalid bpp. Can't render the letter*/
+    }
+
+    static lv_opa_t opa_table[256];
+    static lv_opa_t prev_opa = LV_OPA_TRANSP;
+    static uint32_t prev_bpp = 0;
+    if(opa < LV_OPA_MAX) {
+        if(prev_opa != opa || prev_bpp != bpp) {
+            uint32_t i;
+            for(i = 0; i < shades; i++) {
+                opa_table[i] = bpp_opa_table_p[i] == LV_OPA_COVER ? opa : ((bpp_opa_table_p[i] * opa) >> 8);
+            }
+        }
+        bpp_opa_table_p = opa_table;
+        prev_opa = opa;
+        prev_bpp = bpp;
+    }
+
+    int32_t col, row;
+    int32_t box_w = g->box_w;
+    int32_t box_h = g->box_h;
+    int32_t width_bit = box_w * bpp; /*Letter width in bits*/
+
+    /*Calculate the col/row start/end on the map*/
+    int32_t col_start = pos->x >= draw_ctx->clip_area->x1 ? 0 : draw_ctx->clip_area->x1 - pos->x;
+    int32_t col_end   = pos->x + box_w <= draw_ctx->clip_area->x2 ? box_w : draw_ctx->clip_area->x2 - pos->x + 1;
+    int32_t row_start = pos->y >= draw_ctx->clip_area->y1 ? 0 : draw_ctx->clip_area->y1 - pos->y;
+    int32_t row_end   = pos->y + box_h <= draw_ctx->clip_area->y2 ? box_h : draw_ctx->clip_area->y2 - pos->y + 1;
+
+    /*Move on the map too*/
+    uint32_t bit_ofs = (row_start * width_bit) + (col_start * bpp);
+    map_p += bit_ofs >> 3;
+
+    uint8_t letter_px;
+    uint32_t col_bit;
+    col_bit = bit_ofs & 0x7; /*"& 0x7" equals to "% 8" just faster*/
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.color = dsc->color;
+    blend_dsc.opa = dsc->opa;
+    blend_dsc.blend_mode = dsc->blend_mode;
+
+    lv_coord_t hor_res = lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
+    uint32_t mask_buf_size = box_w * box_h > hor_res ? hor_res : box_w * box_h;
+    lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
+    blend_dsc.mask_buf = mask_buf;
+    int32_t mask_p = 0;
+
+    lv_area_t fill_area;
+    fill_area.x1 = col_start + pos->x;
+    fill_area.x2 = col_end  + pos->x - 1;
+    fill_area.y1 = row_start + pos->y;
+    fill_area.y2 = fill_area.y1;
+#if LV_DRAW_COMPLEX
+    lv_coord_t fill_w = lv_area_get_width(&fill_area);
+    lv_area_t mask_area;
+    lv_area_copy(&mask_area, &fill_area);
+    mask_area.y2 = mask_area.y1 + row_end;
+    bool mask_any = lv_draw_mask_is_any(&mask_area);
+#endif
+    blend_dsc.blend_area = &fill_area;
+    blend_dsc.mask_area = &fill_area;
+
+    uint32_t col_bit_max = 8 - bpp;
+    uint32_t col_bit_row_ofs = (box_w + col_start - col_end) * bpp;
+
+    for(row = row_start ; row < row_end; row++) {
+#if LV_DRAW_COMPLEX
+        int32_t mask_p_start = mask_p;
+#endif
+        bitmask = bitmask_init >> col_bit;
+        for(col = col_start; col < col_end; col++) {
+            /*Load the pixel's opacity into the mask*/
+            letter_px = (*map_p & bitmask) >> (col_bit_max - col_bit);
+            if(letter_px) {
+                mask_buf[mask_p] = bpp_opa_table_p[letter_px];
+            }
+            else {
+                mask_buf[mask_p] = 0;
+            }
+
+            /*Go to the next column*/
+            if(col_bit < col_bit_max) {
+                col_bit += bpp;
+                bitmask = bitmask >> bpp;
+            }
+            else {
+                col_bit = 0;
+                bitmask = bitmask_init;
+                map_p++;
+            }
+
+            /*Next mask byte*/
+            mask_p++;
+        }
+
+#if LV_DRAW_COMPLEX
+        /*Apply masks if any*/
+        if(mask_any) {
+            blend_dsc.mask_res = lv_draw_mask_apply(mask_buf + mask_p_start, fill_area.x1, fill_area.y2,
+                                                    fill_w);
+            if(blend_dsc.mask_res == LV_DRAW_MASK_RES_TRANSP) {
+                lv_memset_00(mask_buf + mask_p_start, fill_w);
+            }
+        }
+#endif
+
+        if((uint32_t) mask_p + (col_end - col_start) < mask_buf_size) {
+            fill_area.y2 ++;
+        }
+        else {
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+            fill_area.y1 = fill_area.y2 + 1;
+            fill_area.y2 = fill_area.y1;
+            mask_p = 0;
+        }
+
+        col_bit += col_bit_row_ofs;
+        map_p += (col_bit >> 3);
+        col_bit = col_bit & 0x7;
+    }
+
+    /*Flush the last part*/
+    if(fill_area.y1 != fill_area.y2) {
+        fill_area.y2--;
+        blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        mask_p = 0;
+    }
+
+    lv_mem_buf_release(mask_buf);
+}
+
+#if LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX
+static void draw_letter_subpx(lv_draw_ctx_t * draw_ctx, const lv_draw_label_dsc_t * dsc, const lv_point_t * pos,
+                              lv_font_glyph_dsc_t * g, const uint8_t * map_p)
+{
+    const uint8_t * bpp_opa_table;
+    uint32_t bitmask_init;
+    uint32_t bitmask;
+    uint32_t bpp = g->bpp;
+    lv_opa_t opa = dsc->opa;
+    if(bpp == 3) bpp = 4;
+
+    switch(bpp) {
+        case 1:
+            bpp_opa_table = _lv_bpp1_opa_table;
+            bitmask_init  = 0x80;
+            break;
+        case 2:
+            bpp_opa_table = _lv_bpp2_opa_table;
+            bitmask_init  = 0xC0;
+            break;
+        case 4:
+            bpp_opa_table = _lv_bpp4_opa_table;
+            bitmask_init  = 0xF0;
+            break;
+        case 8:
+            bpp_opa_table = _lv_bpp8_opa_table;
+            bitmask_init  = 0xFF;
+            break;       /*No opa table, pixel value will be used directly*/
+        default:
+            LV_LOG_WARN("lv_draw_letter: invalid bpp not found");
+            return; /*Invalid bpp. Can't render the letter*/
+    }
+
+    int32_t col, row;
+
+    int32_t box_w = g->box_w;
+    int32_t box_h = g->box_h;
+    int32_t width_bit = box_w * bpp; /*Letter width in bits*/
+
+    /*Calculate the col/row start/end on the map*/
+    int32_t col_start = pos->x >= draw_ctx->clip_area->x1 ? 0 : (draw_ctx->clip_area->x1 - pos->x) * 3;
+    int32_t col_end   = pos->x + box_w / 3 <= draw_ctx->clip_area->x2 ? box_w : (draw_ctx->clip_area->x2 - pos->x + 1) * 3;
+    int32_t row_start = pos->y >= draw_ctx->clip_area->y1 ? 0 : draw_ctx->clip_area->y1 - pos->y;
+    int32_t row_end   = pos->y + box_h <= draw_ctx->clip_area->y2 ? box_h : draw_ctx->clip_area->y2 - pos->y + 1;
+
+    /*Move on the map too*/
+    int32_t bit_ofs = (row_start * width_bit) + (col_start * bpp);
+    map_p += bit_ofs >> 3;
+
+    uint8_t letter_px;
+    lv_opa_t px_opa;
+    int32_t col_bit;
+    col_bit = bit_ofs & 0x7; /*"& 0x7" equals to "% 8" just faster*/
+
+    lv_area_t map_area;
+    map_area.x1 = col_start / 3 + pos->x;
+    map_area.x2 = col_end / 3  + pos->x - 1;
+    map_area.y1 = row_start + pos->y;
+    map_area.y2 = map_area.y1;
+
+    if(map_area.x2 <= map_area.x1) return;
+
+    lv_coord_t hor_res = lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
+    int32_t mask_buf_size = box_w * box_h > hor_res ? hor_res : g->box_w * g->box_h;
+    lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
+    int32_t mask_p = 0;
+
+    lv_color_t * color_buf = lv_mem_buf_get(mask_buf_size * sizeof(lv_color_t));
+
+    int32_t dest_buf_stride = lv_area_get_width(draw_ctx->buf_area);
+    lv_color_t * dest_buf_tmp = draw_ctx->buf;
+
+    /*Set a pointer on draw_buf to the first pixel of the letter*/
+    dest_buf_tmp += ((pos->y - draw_ctx->buf_area->y1) * dest_buf_stride) + pos->x - draw_ctx->buf_area->x1;
+
+    /*If the letter is partially out of mask the move there on draw_buf*/
+    dest_buf_tmp += (row_start * dest_buf_stride) + col_start / 3;
+
+    lv_area_t mask_area;
+    lv_area_copy(&mask_area, &map_area);
+    mask_area.y2 = mask_area.y1 + row_end;
+    bool mask_any = lv_draw_mask_is_any(&map_area);
+    uint8_t font_rgb[3];
+
+    lv_color_t color = dsc->color;
+#if LV_COLOR_16_SWAP == 0
+    uint8_t txt_rgb[3] = {color.ch.red, color.ch.green, color.ch.blue};
+#else
+    uint8_t txt_rgb[3] = {color.ch.red, (color.ch.green_h << 3) + color.ch.green_l, color.ch.blue};
+#endif
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(&blend_dsc));
+    blend_dsc.blend_area = &map_area;
+    blend_dsc.mask_area = &map_area;
+    blend_dsc.src_buf = color_buf;
+    blend_dsc.mask_buf = mask_buf;
+    blend_dsc.opa = opa;
+    blend_dsc.blend_mode = dsc->blend_mode;
+
+    for(row = row_start ; row < row_end; row++) {
+        uint32_t subpx_cnt = 0;
+        bitmask = bitmask_init >> col_bit;
+        int32_t mask_p_start = mask_p;
+
+        for(col = col_start; col < col_end; col++) {
+            /*Load the pixel's opacity into the mask*/
+            letter_px = (*map_p & bitmask) >> (8 - col_bit - bpp);
+            if(letter_px != 0) {
+                if(opa >= LV_OPA_MAX) {
+                    px_opa = bpp == 8 ? letter_px : bpp_opa_table[letter_px];
+                }
+                else {
+                    px_opa = bpp == 8 ? (uint32_t)((uint32_t)letter_px * opa) >> 8
+                             : (uint32_t)((uint32_t)bpp_opa_table[letter_px] * opa) >> 8;
+                }
+            }
+            else {
+                px_opa = 0;
+            }
+
+            font_rgb[subpx_cnt] = px_opa;
+
+            subpx_cnt ++;
+            if(subpx_cnt == 3) {
+                subpx_cnt = 0;
+
+                lv_color_t res_color;
+#if LV_COLOR_16_SWAP == 0
+                uint8_t bg_rgb[3] = {dest_buf_tmp->ch.red, dest_buf_tmp->ch.green, dest_buf_tmp->ch.blue};
+#else
+                uint8_t bg_rgb[3] = {dest_buf_tmp->ch.red,
+                                     (dest_buf_tmp->ch.green_h << 3) + dest_buf_tmp->ch.green_l,
+                                     dest_buf_tmp->ch.blue
+                                    };
+#endif
+
+#if LV_FONT_SUBPX_BGR
+                res_color.ch.blue = (uint32_t)((uint32_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8;
+                res_color.ch.red = (uint32_t)((uint32_t)txt_rgb[2] * font_rgb[2] + (bg_rgb[2] * (255 - font_rgb[2]))) >> 8;
+#else
+                res_color.ch.red = (uint32_t)((uint16_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8;
+                res_color.ch.blue = (uint32_t)((uint16_t)txt_rgb[2] * font_rgb[2] + (bg_rgb[2] * (255 - font_rgb[2]))) >> 8;
+#endif
+
+#if LV_COLOR_16_SWAP == 0
+                res_color.ch.green = (uint32_t)((uint32_t)txt_rgb[1] * font_rgb[1] + (bg_rgb[1] * (255 - font_rgb[1]))) >> 8;
+#else
+                uint8_t green = (uint32_t)((uint32_t)txt_rgb[1] * font_rgb[1] + (bg_rgb[1] * (255 - font_rgb[1]))) >> 8;
+                res_color.ch.green_h = green >> 3;
+                res_color.ch.green_l = green & 0x7;
+#endif
+
+#if LV_COLOR_DEPTH == 32
+                res_color.ch.alpha = 0xff;
+#endif
+
+                if(font_rgb[0] == 0 && font_rgb[1] == 0 && font_rgb[2] == 0) mask_buf[mask_p] = LV_OPA_TRANSP;
+                else mask_buf[mask_p] = LV_OPA_COVER;
+                color_buf[mask_p] = res_color;
+
+                /*Next mask byte*/
+                mask_p++;
+                dest_buf_tmp++;
+            }
+
+            /*Go to the next column*/
+            if(col_bit < (int32_t)(8 - bpp)) {
+                col_bit += bpp;
+                bitmask = bitmask >> bpp;
+            }
+            else {
+                col_bit = 0;
+                bitmask = bitmask_init;
+                map_p++;
+            }
+        }
+
+        /*Apply masks if any*/
+        if(mask_any) {
+            blend_dsc.mask_res = lv_draw_mask_apply(mask_buf + mask_p_start, map_area.x1, map_area.y2,
+                                                    lv_area_get_width(&map_area));
+            if(blend_dsc.mask_res == LV_DRAW_MASK_RES_TRANSP) {
+                lv_memset_00(mask_buf + mask_p_start, lv_area_get_width(&map_area));
+            }
+        }
+
+        if((int32_t) mask_p + (col_end - col_start) < mask_buf_size) {
+            map_area.y2 ++;
+        }
+        else {
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+            map_area.y1 = map_area.y2 + 1;
+            map_area.y2 = map_area.y1;
+            mask_p = 0;
+        }
+
+        col_bit += ((box_w - col_end) + col_start) * bpp;
+
+        map_p += (col_bit >> 3);
+        col_bit = col_bit & 0x7;
+
+        /*Next row in draw_buf*/
+        dest_buf_tmp += dest_buf_stride - (col_end - col_start) / 3;
+    }
+
+    /*Flush the last part*/
+    if(map_area.y1 != map_area.y2) {
+        map_area.y2--;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    lv_mem_buf_release(mask_buf);
+    lv_mem_buf_release(color_buf);
+}
+#endif /*LV_DRAW_COMPLEX && LV_USE_FONT_SUBPX*/
+
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_line.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_line.c
new file mode 100644
index 000000000..73833c164
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_line.c
@@ -0,0 +1,443 @@
+/**
+ * @file lv_draw_line.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include <stdbool.h>
+#include "lv_draw_sw.h"
+#include "../../misc/lv_math.h"
+#include "../../core/lv_refr.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                                 const lv_point_t * point1, const lv_point_t * point2);
+LV_ATTRIBUTE_FAST_MEM static void draw_line_hor(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                                const lv_point_t * point1, const lv_point_t * point2);
+LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                                const lv_point_t * point1, const lv_point_t * point2);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Draw a line
+ * @param point1 first point of the line
+ * @param point2 second point of the line
+ * @param clip the line will be drawn only in this area
+ * @param dsc pointer to an initialized `lv_draw_line_dsc_t` variable
+ */
+LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_line(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                           const lv_point_t * point1, const lv_point_t * point2)
+{
+    if(dsc->width == 0) return;
+    if(dsc->opa <= LV_OPA_MIN) return;
+
+    if(point1->x == point2->x && point1->y == point2->y) return;
+
+    lv_area_t clip_line;
+    clip_line.x1 = LV_MIN(point1->x, point2->x) - dsc->width / 2;
+    clip_line.x2 = LV_MAX(point1->x, point2->x) + dsc->width / 2;
+    clip_line.y1 = LV_MIN(point1->y, point2->y) - dsc->width / 2;
+    clip_line.y2 = LV_MAX(point1->y, point2->y) + dsc->width / 2;
+
+    bool is_common;
+    is_common = _lv_area_intersect(&clip_line, &clip_line, draw_ctx->clip_area);
+    if(!is_common) return;
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_line;
+
+    if(point1->y == point2->y) draw_line_hor(draw_ctx, dsc, point1, point2);
+    else if(point1->x == point2->x) draw_line_ver(draw_ctx, dsc, point1, point2);
+    else draw_line_skew(draw_ctx, dsc, point1, point2);
+
+    if(dsc->round_end || dsc->round_start) {
+        lv_draw_rect_dsc_t cir_dsc;
+        lv_draw_rect_dsc_init(&cir_dsc);
+        cir_dsc.bg_color = dsc->color;
+        cir_dsc.radius = LV_RADIUS_CIRCLE;
+        cir_dsc.bg_opa = dsc->opa;
+
+        int32_t r = (dsc->width >> 1);
+        int32_t r_corr = (dsc->width & 1) ? 0 : 1;
+        lv_area_t cir_area;
+
+        if(dsc->round_start) {
+            cir_area.x1 = point1->x - r;
+            cir_area.y1 = point1->y - r;
+            cir_area.x2 = point1->x + r - r_corr;
+            cir_area.y2 = point1->y + r - r_corr ;
+            lv_draw_rect(draw_ctx, &cir_dsc, &cir_area);
+        }
+
+        if(dsc->round_end) {
+            cir_area.x1 = point2->x - r;
+            cir_area.y1 = point2->y - r;
+            cir_area.x2 = point2->x + r - r_corr;
+            cir_area.y2 = point2->y + r - r_corr ;
+            lv_draw_rect(draw_ctx, &cir_dsc, &cir_area);
+        }
+    }
+
+    draw_ctx->clip_area = clip_area_ori;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+
+LV_ATTRIBUTE_FAST_MEM static void draw_line_hor(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                                const lv_point_t * point1, const lv_point_t * point2)
+{
+    int32_t w = dsc->width - 1;
+    int32_t w_half0 = w >> 1;
+    int32_t w_half1 = w_half0 + (w & 0x1); /*Compensate rounding error*/
+
+    lv_area_t blend_area;
+    blend_area.x1 = LV_MIN(point1->x, point2->x);
+    blend_area.x2 = LV_MAX(point1->x, point2->x)  - 1;
+    blend_area.y1 = point1->y - w_half1;
+    blend_area.y2 = point1->y + w_half0;
+
+    bool is_common;
+    is_common = _lv_area_intersect(&blend_area, &blend_area, draw_ctx->clip_area);
+    if(!is_common) return;
+
+    bool dashed = dsc->dash_gap && dsc->dash_width ? true : false;
+    bool simple_mode = true;
+    if(lv_draw_mask_is_any(&blend_area)) simple_mode = false;
+    else if(dashed) simple_mode = false;
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.blend_area = &blend_area;
+    blend_dsc.color = dsc->color;
+    blend_dsc.opa = dsc->opa;
+
+    /*If there is no mask then simply draw a rectangle*/
+    if(simple_mode) {
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+#if LV_DRAW_COMPLEX
+    /*If there other mask apply it*/
+    else {
+
+        int32_t blend_area_w = lv_area_get_width(&blend_area);
+
+        lv_coord_t y2 = blend_area.y2;
+        blend_area.y2 = blend_area.y1;
+
+        lv_coord_t dash_start = 0;
+        if(dashed) {
+            dash_start = (blend_area.x1) % (dsc->dash_gap + dsc->dash_width);
+        }
+
+        lv_opa_t * mask_buf = lv_mem_buf_get(blend_area_w);
+        blend_dsc.mask_buf = mask_buf;
+        blend_dsc.mask_area = &blend_area;
+        int32_t h;
+        for(h = blend_area.y1; h <= y2; h++) {
+            lv_memset_ff(mask_buf, blend_area_w);
+            blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, h, blend_area_w);
+
+            if(dashed) {
+                if(blend_dsc.mask_res != LV_DRAW_MASK_RES_TRANSP) {
+                    lv_coord_t dash_cnt = dash_start;
+                    lv_coord_t i;
+                    for(i = 0; i < blend_area_w; i++, dash_cnt++) {
+                        if(dash_cnt <= dsc->dash_width) {
+                            int16_t diff = dsc->dash_width - dash_cnt;
+                            i += diff;
+                            dash_cnt += diff;
+                        }
+                        else if(dash_cnt >= dsc->dash_gap + dsc->dash_width) {
+                            dash_cnt = 0;
+                        }
+                        else {
+                            mask_buf[i] = 0x00;
+                        }
+                    }
+
+                    blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+            }
+
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+            blend_area.y1++;
+            blend_area.y2++;
+        }
+        lv_mem_buf_release(mask_buf);
+    }
+#endif /*LV_DRAW_COMPLEX*/
+}
+
+LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                                const lv_point_t * point1, const lv_point_t * point2)
+{
+    int32_t w = dsc->width - 1;
+    int32_t w_half0 = w >> 1;
+    int32_t w_half1 = w_half0 + (w & 0x1); /*Compensate rounding error*/
+
+    lv_area_t blend_area;
+    blend_area.x1 = point1->x - w_half1;
+    blend_area.x2 = point1->x + w_half0;
+    blend_area.y1 = LV_MIN(point1->y, point2->y);
+    blend_area.y2 = LV_MAX(point1->y, point2->y) - 1;
+
+    bool is_common;
+    is_common = _lv_area_intersect(&blend_area, &blend_area, draw_ctx->clip_area);
+    if(!is_common) return;
+
+    bool dashed = dsc->dash_gap && dsc->dash_width ? true : false;
+    bool simple_mode = true;
+    if(lv_draw_mask_is_any(&blend_area)) simple_mode = false;
+    else if(dashed) simple_mode = false;
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.blend_area = &blend_area;
+    blend_dsc.color = dsc->color;
+    blend_dsc.opa = dsc->opa;
+
+    /*If there is no mask then simply draw a rectangle*/
+    if(simple_mode) {
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+#if LV_DRAW_COMPLEX
+    /*If there other mask apply it*/
+    else {
+        int32_t draw_area_w = lv_area_get_width(&blend_area);
+
+        lv_coord_t y2 = blend_area.y2;
+        blend_area.y2 = blend_area.y1;
+
+        lv_opa_t * mask_buf = lv_mem_buf_get(draw_area_w);
+        blend_dsc.mask_buf = mask_buf;
+        blend_dsc.mask_area = &blend_area;
+
+        lv_coord_t dash_start = 0;
+        if(dashed) {
+            dash_start = (blend_area.y1) % (dsc->dash_gap + dsc->dash_width);
+        }
+
+        lv_coord_t dash_cnt = dash_start;
+
+        int32_t h;
+        for(h = blend_area.y1; h <= y2; h++) {
+            lv_memset_ff(mask_buf, draw_area_w);
+            blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, h, draw_area_w);
+
+            if(dashed) {
+                if(blend_dsc.mask_res != LV_DRAW_MASK_RES_TRANSP) {
+                    if(dash_cnt > dsc->dash_width) {
+                        blend_dsc.mask_res = LV_DRAW_MASK_RES_TRANSP;
+                    }
+
+                    if(dash_cnt >= dsc->dash_gap + dsc->dash_width) {
+                        dash_cnt = 0;
+                    }
+                }
+                dash_cnt ++;
+            }
+
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+            blend_area.y1++;
+            blend_area.y2++;
+        }
+        lv_mem_buf_release(mask_buf);
+    }
+#endif /*LV_DRAW_COMPLEX*/
+}
+
+LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_line_dsc_t * dsc,
+                                                 const lv_point_t * point1, const lv_point_t * point2)
+{
+#if LV_DRAW_COMPLEX
+    /*Keep the great y in p1*/
+    lv_point_t p1;
+    lv_point_t p2;
+    if(point1->y < point2->y) {
+        p1.y = point1->y;
+        p2.y = point2->y;
+        p1.x = point1->x;
+        p2.x = point2->x;
+    }
+    else {
+        p1.y = point2->y;
+        p2.y = point1->y;
+        p1.x = point2->x;
+        p2.x = point1->x;
+    }
+
+    int32_t xdiff = p2.x - p1.x;
+    int32_t ydiff = p2.y - p1.y;
+    bool flat = LV_ABS(xdiff) > LV_ABS(ydiff) ? true : false;
+
+    static const uint8_t wcorr[] = {
+        128, 128, 128, 129, 129, 130, 130, 131,
+        132, 133, 134, 135, 137, 138, 140, 141,
+        143, 145, 147, 149, 151, 153, 155, 158,
+        160, 162, 165, 167, 170, 173, 175, 178,
+        181,
+    };
+
+    int32_t w = dsc->width;
+    int32_t wcorr_i = 0;
+    if(flat) wcorr_i = (LV_ABS(ydiff) << 5) / LV_ABS(xdiff);
+    else wcorr_i = (LV_ABS(xdiff) << 5) / LV_ABS(ydiff);
+
+    w = (w * wcorr[wcorr_i] + 63) >> 7;     /*+ 63 for rounding*/
+    int32_t w_half0 = w >> 1;
+    int32_t w_half1 = w_half0 + (w & 0x1); /*Compensate rounding error*/
+
+    lv_area_t blend_area;
+    blend_area.x1 = LV_MIN(p1.x, p2.x) - w;
+    blend_area.x2 = LV_MAX(p1.x, p2.x) + w;
+    blend_area.y1 = LV_MIN(p1.y, p2.y) - w;
+    blend_area.y2 = LV_MAX(p1.y, p2.y) + w;
+
+    /*Get the union of `coords` and `clip`*/
+    /*`clip` is already truncated to the `draw_buf` size
+     *in 'lv_refr_area' function*/
+    bool is_common = _lv_area_intersect(&blend_area, &blend_area, draw_ctx->clip_area);
+    if(is_common == false) return;
+
+    lv_draw_mask_line_param_t mask_left_param;
+    lv_draw_mask_line_param_t mask_right_param;
+    lv_draw_mask_line_param_t mask_top_param;
+    lv_draw_mask_line_param_t mask_bottom_param;
+
+    if(flat) {
+        if(xdiff > 0) {
+            lv_draw_mask_line_points_init(&mask_left_param, p1.x, p1.y - w_half0, p2.x, p2.y - w_half0,
+                                          LV_DRAW_MASK_LINE_SIDE_LEFT);
+            lv_draw_mask_line_points_init(&mask_right_param, p1.x, p1.y + w_half1, p2.x, p2.y + w_half1,
+                                          LV_DRAW_MASK_LINE_SIDE_RIGHT);
+        }
+        else {
+            lv_draw_mask_line_points_init(&mask_left_param, p1.x, p1.y + w_half1, p2.x, p2.y + w_half1,
+                                          LV_DRAW_MASK_LINE_SIDE_LEFT);
+            lv_draw_mask_line_points_init(&mask_right_param, p1.x, p1.y - w_half0, p2.x, p2.y - w_half0,
+                                          LV_DRAW_MASK_LINE_SIDE_RIGHT);
+        }
+    }
+    else {
+        lv_draw_mask_line_points_init(&mask_left_param, p1.x + w_half1, p1.y, p2.x + w_half1, p2.y,
+                                      LV_DRAW_MASK_LINE_SIDE_LEFT);
+        lv_draw_mask_line_points_init(&mask_right_param, p1.x - w_half0, p1.y, p2.x - w_half0, p2.y,
+                                      LV_DRAW_MASK_LINE_SIDE_RIGHT);
+    }
+
+    /*Use the normal vector for the endings*/
+
+    int16_t mask_left_id = lv_draw_mask_add(&mask_left_param, NULL);
+    int16_t mask_right_id = lv_draw_mask_add(&mask_right_param, NULL);
+    int16_t mask_top_id = LV_MASK_ID_INV;
+    int16_t mask_bottom_id = LV_MASK_ID_INV;
+
+    if(!dsc->raw_end) {
+        lv_draw_mask_line_points_init(&mask_top_param, p1.x, p1.y, p1.x - ydiff, p1.y + xdiff, LV_DRAW_MASK_LINE_SIDE_BOTTOM);
+        lv_draw_mask_line_points_init(&mask_bottom_param, p2.x, p2.y, p2.x - ydiff, p2.y + xdiff,  LV_DRAW_MASK_LINE_SIDE_TOP);
+        mask_top_id = lv_draw_mask_add(&mask_top_param, NULL);
+        mask_bottom_id = lv_draw_mask_add(&mask_bottom_param, NULL);
+    }
+
+    /*The real draw area is around the line.
+     *It's easy to calculate with steep lines, but the area can be very wide with very flat lines.
+     *So deal with it only with steep lines.*/
+    int32_t draw_area_w = lv_area_get_width(&blend_area);
+
+    /*Draw the background line by line*/
+    int32_t h;
+    uint32_t hor_res = (uint32_t)lv_disp_get_hor_res(_lv_refr_get_disp_refreshing());
+    size_t mask_buf_size = LV_MIN(lv_area_get_size(&blend_area), hor_res);
+    lv_opa_t * mask_buf = lv_mem_buf_get(mask_buf_size);
+
+    lv_coord_t y2 = blend_area.y2;
+    blend_area.y2 = blend_area.y1;
+
+    uint32_t mask_p = 0;
+    lv_memset_ff(mask_buf, mask_buf_size);
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.blend_area = &blend_area;
+    blend_dsc.color = dsc->color;
+    blend_dsc.opa = dsc->opa;
+    blend_dsc.mask_buf = mask_buf;
+    blend_dsc.mask_area = &blend_area;
+
+    /*Fill the first row with 'color'*/
+    for(h = blend_area.y1; h <= y2; h++) {
+        blend_dsc.mask_res = lv_draw_mask_apply(&mask_buf[mask_p], blend_area.x1, h, draw_area_w);
+        if(blend_dsc.mask_res == LV_DRAW_MASK_RES_TRANSP) {
+            lv_memset_00(&mask_buf[mask_p], draw_area_w);
+        }
+
+        mask_p += draw_area_w;
+        if((uint32_t) mask_p + draw_area_w < mask_buf_size) {
+            blend_area.y2 ++;
+        }
+        else {
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+            blend_area.y1 = blend_area.y2 + 1;
+            blend_area.y2 = blend_area.y1;
+            mask_p = 0;
+            lv_memset_ff(mask_buf, mask_buf_size);
+        }
+    }
+
+    /*Flush the last part*/
+    if(blend_area.y1 != blend_area.y2) {
+        blend_area.y2--;
+        blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    lv_mem_buf_release(mask_buf);
+
+    lv_draw_mask_free_param(&mask_left_param);
+    lv_draw_mask_free_param(&mask_right_param);
+    if(mask_top_id != LV_MASK_ID_INV) lv_draw_mask_free_param(&mask_top_param);
+    if(mask_bottom_id != LV_MASK_ID_INV) lv_draw_mask_free_param(&mask_bottom_param);
+    lv_draw_mask_remove_id(mask_left_id);
+    lv_draw_mask_remove_id(mask_right_id);
+    lv_draw_mask_remove_id(mask_top_id);
+    lv_draw_mask_remove_id(mask_bottom_id);
+#else
+    LV_UNUSED(point1);
+    LV_UNUSED(point2);
+    LV_UNUSED(draw_ctx);
+    LV_UNUSED(dsc);
+    LV_LOG_WARN("Can't draw skewed line with LV_DRAW_COMPLEX == 0");
+#endif /*LV_DRAW_COMPLEX*/
+}
+
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_polygon.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_polygon.c
new file mode 100644
index 000000000..a05b4713e
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_polygon.c
@@ -0,0 +1,207 @@
+/**
+ * @file lv_draw_sw_polygon.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw.h"
+#include "../../misc/lv_math.h"
+#include "../../misc/lv_mem.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_color.h"
+#include "../lv_draw_rect.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Draw a polygon. Only convex polygons are supported
+ * @param points an array of points
+ * @param point_cnt number of points
+ * @param clip_area polygon will be drawn only in this area
+ * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable
+ */
+void lv_draw_sw_polygon(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * draw_dsc, const lv_point_t * points,
+                        uint16_t point_cnt)
+{
+#if LV_DRAW_COMPLEX
+    if(point_cnt < 3) return;
+    if(points == NULL) return;
+
+    /*Join adjacent points if they are on the same coordinate*/
+    lv_point_t * p = lv_mem_buf_get(point_cnt * sizeof(lv_point_t));
+    if(p == NULL) return;
+    uint16_t i;
+    uint16_t pcnt = 0;
+    p[0] = points[0];
+    for(i = 0; i < point_cnt - 1; i++) {
+        if(points[i].x != points[i + 1].x || points[i].y != points[i + 1].y) {
+            p[pcnt] = points[i];
+            pcnt++;
+        }
+    }
+    /*The first and the last points are also adjacent*/
+    if(points[0].x != points[point_cnt - 1].x || points[0].y != points[point_cnt - 1].y) {
+        p[pcnt] = points[point_cnt - 1];
+        pcnt++;
+    }
+
+    point_cnt = pcnt;
+    if(point_cnt < 3) {
+        lv_mem_buf_release(p);
+        return;
+    }
+
+    lv_area_t poly_coords = {.x1 = LV_COORD_MAX, .y1 = LV_COORD_MAX, .x2 = LV_COORD_MIN, .y2 = LV_COORD_MIN};
+
+    for(i = 0; i < point_cnt; i++) {
+        poly_coords.x1 = LV_MIN(poly_coords.x1, p[i].x);
+        poly_coords.y1 = LV_MIN(poly_coords.y1, p[i].y);
+        poly_coords.x2 = LV_MAX(poly_coords.x2, p[i].x);
+        poly_coords.y2 = LV_MAX(poly_coords.y2, p[i].y);
+    }
+
+    bool is_common;
+    lv_area_t clip_area;
+    is_common = _lv_area_intersect(&clip_area, &poly_coords, draw_ctx->clip_area);
+    if(!is_common) {
+        lv_mem_buf_release(p);
+        return;
+    }
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
+
+    /*Find the lowest point*/
+    lv_coord_t y_min = p[0].y;
+    int16_t y_min_i = 0;
+
+    for(i = 1; i < point_cnt; i++) {
+        if(p[i].y < y_min) {
+            y_min = p[i].y;
+            y_min_i = i;
+        }
+    }
+
+    lv_draw_mask_line_param_t * mp = lv_mem_buf_get(sizeof(lv_draw_mask_line_param_t) * point_cnt);
+    lv_draw_mask_line_param_t * mp_next = mp;
+
+    int32_t i_prev_left = y_min_i;
+    int32_t i_prev_right = y_min_i;
+    int32_t i_next_left;
+    int32_t i_next_right;
+    uint32_t mask_cnt = 0;
+
+    /*Get the index of the left and right points*/
+    i_next_left = y_min_i - 1;
+    if(i_next_left < 0) i_next_left = point_cnt + i_next_left;
+
+    i_next_right = y_min_i + 1;
+    if(i_next_right > point_cnt - 1) i_next_right = 0;
+
+    /**
+     * Check if the order of points is inverted or not.
+     * The normal case is when the left point is on `y_min_i - 1`
+     * Explanation:
+     *   if angle(p_left) < angle(p_right) -> inverted
+     *   dy_left/dx_left < dy_right/dx_right
+     *   dy_left * dx_right < dy_right * dx_left
+     */
+    lv_coord_t dxl = p[i_next_left].x - p[y_min_i].x;
+    lv_coord_t dxr = p[i_next_right].x - p[y_min_i].x;
+    lv_coord_t dyl = p[i_next_left].y - p[y_min_i].y;
+    lv_coord_t dyr = p[i_next_right].y - p[y_min_i].y;
+
+    bool inv = false;
+    if(dyl * dxr < dyr * dxl) inv = true;
+
+    do {
+        if(!inv) {
+            i_next_left = i_prev_left - 1;
+            if(i_next_left < 0) i_next_left = point_cnt + i_next_left;
+
+            i_next_right = i_prev_right + 1;
+            if(i_next_right > point_cnt - 1) i_next_right = 0;
+        }
+        else {
+            i_next_left = i_prev_left + 1;
+            if(i_next_left > point_cnt - 1) i_next_left = 0;
+
+            i_next_right = i_prev_right - 1;
+            if(i_next_right < 0) i_next_right = point_cnt + i_next_right;
+        }
+
+        if(p[i_next_left].y >= p[i_prev_left].y) {
+            if(p[i_next_left].y != p[i_prev_left].y &&
+               p[i_next_left].x != p[i_prev_left].x) {
+                lv_draw_mask_line_points_init(mp_next, p[i_prev_left].x, p[i_prev_left].y,
+                                              p[i_next_left].x, p[i_next_left].y,
+                                              LV_DRAW_MASK_LINE_SIDE_RIGHT);
+                lv_draw_mask_add(mp_next, mp);
+                mp_next++;
+            }
+            mask_cnt++;
+            i_prev_left = i_next_left;
+        }
+
+        if(mask_cnt == point_cnt) break;
+
+        if(p[i_next_right].y >= p[i_prev_right].y) {
+            if(p[i_next_right].y != p[i_prev_right].y &&
+               p[i_next_right].x != p[i_prev_right].x) {
+
+                lv_draw_mask_line_points_init(mp_next, p[i_prev_right].x, p[i_prev_right].y,
+                                              p[i_next_right].x, p[i_next_right].y,
+                                              LV_DRAW_MASK_LINE_SIDE_LEFT);
+                lv_draw_mask_add(mp_next, mp);
+                mp_next++;
+            }
+            mask_cnt++;
+            i_prev_right = i_next_right;
+        }
+
+    } while(mask_cnt < point_cnt);
+
+    lv_draw_rect(draw_ctx, draw_dsc, &poly_coords);
+
+    lv_draw_mask_remove_custom(mp);
+
+    lv_mem_buf_release(mp);
+    lv_mem_buf_release(p);
+
+    draw_ctx->clip_area = clip_area_ori;
+#else
+    LV_UNUSED(points);
+    LV_UNUSED(point_cnt);
+    LV_UNUSED(draw_ctx);
+    LV_UNUSED(draw_dsc);
+    LV_LOG_WARN("Can't draw polygon with LV_DRAW_COMPLEX == 0");
+#endif /*LV_DRAW_COMPLEX*/
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
diff --git a/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_rect.c b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_rect.c
new file mode 100644
index 000000000..d94431b0c
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/draw/sw/lv_draw_sw_rect.c
@@ -0,0 +1,1419 @@
+/**
+ * @file lv_draw_rect.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_sw.h"
+#include "../../misc/lv_math.h"
+#include "../../misc/lv_txt_ap.h"
+#include "../../core/lv_refr.h"
+#include "../../misc/lv_assert.h"
+#include "lv_draw_sw_dither.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define SHADOW_UPSCALE_SHIFT    6
+#define SHADOW_ENHANCE          1
+#define SPLIT_LIMIT             50
+
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static void draw_bg(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+static void draw_bg_img(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+static void draw_border(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+
+static void draw_outline(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
+
+#if LV_DRAW_COMPLEX
+LV_ATTRIBUTE_FAST_MEM static void draw_shadow(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc,
+                                              const lv_area_t * coords);
+LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coords, uint16_t * sh_buf, lv_coord_t s,
+                                                         lv_coord_t r);
+LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, uint16_t * sh_ups_buf);
+#endif
+
+void draw_border_generic(lv_draw_ctx_t * draw_ctx, const lv_area_t * outer_area, const lv_area_t * inner_area,
+                         lv_coord_t rout, lv_coord_t rin, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
+
+static void draw_border_simple(lv_draw_ctx_t * draw_ctx, const lv_area_t * outer_area, const lv_area_t * inner_area,
+                               lv_color_t color, lv_opa_t opa);
+
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+#if defined(LV_SHADOW_CACHE_SIZE) && LV_SHADOW_CACHE_SIZE > 0
+    static uint8_t sh_cache[LV_SHADOW_CACHE_SIZE * LV_SHADOW_CACHE_SIZE];
+    static int32_t sh_cache_size = -1;
+    static int32_t sh_cache_r = -1;
+#endif
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_draw_sw_rect(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+#if LV_DRAW_COMPLEX
+    draw_shadow(draw_ctx, dsc, coords);
+#endif
+
+    draw_bg(draw_ctx, dsc, coords);
+    draw_bg_img(draw_ctx, dsc, coords);
+
+    draw_border(draw_ctx, dsc, coords);
+
+    draw_outline(draw_ctx, dsc, coords);
+
+    LV_ASSERT_MEM_INTEGRITY();
+}
+
+void lv_draw_sw_bg(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+#if LV_COLOR_SCREEN_TRANSP && LV_COLOR_DEPTH == 32
+    lv_memset_00(draw_ctx->buf, lv_area_get_size(draw_ctx->buf_area) * sizeof(lv_color_t));
+#endif
+
+    draw_bg(draw_ctx, dsc, coords);
+    draw_bg_img(draw_ctx, dsc, coords);
+}
+
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void draw_bg(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+    if(dsc->bg_opa <= LV_OPA_MIN) return;
+
+    lv_area_t bg_coords;
+    lv_area_copy(&bg_coords, coords);
+
+    /*If the border fully covers make the bg area 1px smaller to avoid artifacts on the corners*/
+    if(dsc->border_width > 1 && dsc->border_opa >= LV_OPA_MAX && dsc->radius != 0) {
+        bg_coords.x1 += (dsc->border_side & LV_BORDER_SIDE_LEFT) ? 1 : 0;
+        bg_coords.y1 += (dsc->border_side & LV_BORDER_SIDE_TOP) ? 1 : 0;
+        bg_coords.x2 -= (dsc->border_side & LV_BORDER_SIDE_RIGHT) ? 1 : 0;
+        bg_coords.y2 -= (dsc->border_side & LV_BORDER_SIDE_BOTTOM) ? 1 : 0;
+    }
+
+    lv_area_t clipped_coords;
+    if(!_lv_area_intersect(&clipped_coords, &bg_coords, draw_ctx->clip_area)) return;
+
+    lv_grad_dir_t grad_dir = dsc->bg_grad.dir;
+    lv_color_t bg_color    = grad_dir == LV_GRAD_DIR_NONE ? dsc->bg_color : dsc->bg_grad.stops[0].color;
+    if(bg_color.full == dsc->bg_grad.stops[1].color.full) grad_dir = LV_GRAD_DIR_NONE;
+
+    bool mask_any = lv_draw_mask_is_any(&bg_coords);
+    lv_draw_sw_blend_dsc_t blend_dsc = {0};
+    blend_dsc.blend_mode = dsc->blend_mode;
+    blend_dsc.color = bg_color;
+
+    /*Most simple case: just a plain rectangle*/
+    if(!mask_any && dsc->radius == 0 && (grad_dir == LV_GRAD_DIR_NONE)) {
+        blend_dsc.blend_area = &bg_coords;
+        blend_dsc.opa = dsc->bg_opa;
+
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        return;
+    }
+
+    /*Complex case: there is gradient, mask, or radius*/
+#if LV_DRAW_COMPLEX == 0
+    LV_LOG_WARN("Can't draw complex rectangle because LV_DRAW_COMPLEX = 0");
+#else
+    lv_opa_t opa = dsc->bg_opa >= LV_OPA_MAX ? LV_OPA_COVER : dsc->bg_opa;
+
+    /*Get the real radius. Can't be larger than the half of the shortest side */
+    lv_coord_t coords_bg_w = lv_area_get_width(&bg_coords);
+    lv_coord_t coords_bg_h = lv_area_get_height(&bg_coords);
+    int32_t short_side = LV_MIN(coords_bg_w, coords_bg_h);
+    int32_t rout = LV_MIN(dsc->radius, short_side >> 1);
+
+    /*Add a radius mask if there is radius*/
+    int32_t clipped_w = lv_area_get_width(&clipped_coords);
+    int16_t mask_rout_id = LV_MASK_ID_INV;
+    lv_opa_t * mask_buf = NULL;
+    lv_draw_mask_radius_param_t mask_rout_param;
+    if(rout > 0 || mask_any) {
+        mask_buf = lv_mem_buf_get(clipped_w);
+        lv_draw_mask_radius_init(&mask_rout_param, &bg_coords, rout, false);
+        mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
+    }
+
+    int32_t h;
+
+    lv_area_t blend_area;
+    blend_area.x1 = clipped_coords.x1;
+    blend_area.x2 = clipped_coords.x2;
+
+    blend_dsc.mask_buf = mask_buf;
+    blend_dsc.blend_area = &blend_area;
+    blend_dsc.mask_area = &blend_area;
+    blend_dsc.opa = LV_OPA_COVER;
+
+
+    /*Get gradient if appropriate*/
+    lv_grad_t * grad = lv_gradient_get(&dsc->bg_grad, coords_bg_w, coords_bg_h);
+    if(grad && grad_dir == LV_GRAD_DIR_HOR) {
+        blend_dsc.src_buf = grad->map + clipped_coords.x1 - bg_coords.x1;
+    }
+
+#if _DITHER_GRADIENT
+    lv_dither_mode_t dither_mode = dsc->bg_grad.dither;
+    lv_dither_func_t dither_func = &lv_dither_none;
+    lv_coord_t grad_size = coords_bg_w;
+    if(grad_dir == LV_GRAD_DIR_VER && dither_mode != LV_DITHER_NONE) {
+        /* When dithering, we are still using a map that's changing from line to line*/
+        blend_dsc.src_buf = grad->map;
+    }
+
+    if(grad && dither_mode == LV_DITHER_NONE) {
+        grad->filled = 0; /*Should we force refilling it each draw call ?*/
+        if(grad_dir == LV_GRAD_DIR_VER)
+            grad_size = coords_bg_h;
+    }
+    else
+#if LV_DITHER_ERROR_DIFFUSION
+        if(dither_mode == LV_DITHER_ORDERED)
+#endif
+            switch(grad_dir) {
+                case LV_GRAD_DIR_HOR:
+                    dither_func = lv_dither_ordered_hor;
+                    break;
+                case LV_GRAD_DIR_VER:
+                    dither_func = lv_dither_ordered_ver;
+                    break;
+                default:
+                    dither_func = NULL;
+            }
+
+#if LV_DITHER_ERROR_DIFFUSION
+        else if(dither_mode == LV_DITHER_ERR_DIFF)
+            switch(grad_dir) {
+                case LV_GRAD_DIR_HOR:
+                    dither_func = lv_dither_err_diff_hor;
+                    break;
+                case LV_GRAD_DIR_VER:
+                    dither_func = lv_dither_err_diff_ver;
+                    break;
+                default:
+                    dither_func = NULL;
+            }
+#endif
+#endif
+
+    /*There is another mask too. Draw line by line. */
+    if(mask_any) {
+        for(h = clipped_coords.y1; h <= clipped_coords.y2; h++) {
+            blend_area.y1 = h;
+            blend_area.y2 = h;
+
+            /* Initialize the mask to opa instead of 0xFF and blend with LV_OPA_COVER.
+             * It saves calculating the final opa in lv_draw_sw_blend*/
+            lv_memset(mask_buf, opa, clipped_w);
+            blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clipped_coords.x1, h, clipped_w);
+            if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+
+#if _DITHER_GRADIENT
+            if(dither_func) dither_func(grad, blend_area.x1,  h - bg_coords.y1, grad_size);
+#endif
+            if(grad_dir == LV_GRAD_DIR_VER) blend_dsc.color = grad->map[h - bg_coords.y1];
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        }
+        goto bg_clean_up;
+    }
+
+
+    /* Draw the top of the rectangle line by line and mirror it to the bottom. */
+    for(h = 0; h < rout; h++) {
+        lv_coord_t top_y = bg_coords.y1 + h;
+        lv_coord_t bottom_y = bg_coords.y2 - h;
+        if(top_y < clipped_coords.y1 && bottom_y > clipped_coords.y2) continue;   /*This line is clipped now*/
+
+        /* Initialize the mask to opa instead of 0xFF and blend with LV_OPA_COVER.
+         * It saves calculating the final opa in lv_draw_sw_blend*/
+        lv_memset(mask_buf, opa, clipped_w);
+        blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, blend_area.x1, top_y, clipped_w);
+        if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+
+        if(top_y >= clipped_coords.y1) {
+            blend_area.y1 = top_y;
+            blend_area.y2 = top_y;
+
+#if _DITHER_GRADIENT
+            if(dither_func) dither_func(grad, blend_area.x1,  top_y - bg_coords.y1, grad_size);
+#endif
+            if(grad_dir == LV_GRAD_DIR_VER) blend_dsc.color = grad->map[top_y - bg_coords.y1];
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        }
+
+        if(bottom_y <= clipped_coords.y2) {
+            blend_area.y1 = bottom_y;
+            blend_area.y2 = bottom_y;
+
+#if _DITHER_GRADIENT
+            if(dither_func) dither_func(grad, blend_area.x1,  bottom_y - bg_coords.y1, grad_size);
+#endif
+            if(grad_dir == LV_GRAD_DIR_VER) blend_dsc.color = grad->map[bottom_y - bg_coords.y1];
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        }
+    }
+
+    /* Draw the center of the rectangle.*/
+
+    /*If no other masks and no gradient, the center is a simple rectangle*/
+    lv_area_t center_coords;
+    center_coords.x1 = bg_coords.x1;
+    center_coords.x2 = bg_coords.x2;
+    center_coords.y1 = bg_coords.y1 + rout;
+    center_coords.y2 = bg_coords.y2 - rout;
+    bool mask_any_center = lv_draw_mask_is_any(&center_coords);
+    if(!mask_any_center && grad_dir == LV_GRAD_DIR_NONE) {
+        blend_area.y1 = bg_coords.y1 + rout;
+        blend_area.y2 = bg_coords.y2 - rout;
+        blend_dsc.opa = opa;
+        blend_dsc.mask_buf = NULL;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+    /*With gradient and/or mask draw line by line*/
+    else {
+        blend_dsc.opa = opa;
+        blend_dsc.mask_res = LV_DRAW_MASK_RES_FULL_COVER;
+        int32_t h_end = bg_coords.y2 - rout;
+        for(h = bg_coords.y1 + rout; h <= h_end; h++) {
+            /*If there is no other mask do not apply mask as in the center there is no radius to mask*/
+            if(mask_any_center) {
+                lv_memset(mask_buf, opa, clipped_w);
+                blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clipped_coords.x1, h, clipped_w);
+            }
+
+            blend_area.y1 = h;
+            blend_area.y2 = h;
+
+#if _DITHER_GRADIENT
+            if(dither_func) dither_func(grad, blend_area.x1,  h - bg_coords.y1, grad_size);
+#endif
+            if(grad_dir == LV_GRAD_DIR_VER) blend_dsc.color = grad->map[h - bg_coords.y1];
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        }
+    }
+
+
+bg_clean_up:
+    if(mask_buf) lv_mem_buf_release(mask_buf);
+    if(mask_rout_id != LV_MASK_ID_INV) {
+        lv_draw_mask_remove_id(mask_rout_id);
+        lv_draw_mask_free_param(&mask_rout_param);
+    }
+    if(grad) {
+        lv_gradient_cleanup(grad);
+    }
+
+#endif
+}
+
+static void draw_bg_img(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+    if(dsc->bg_img_src == NULL) return;
+    if(dsc->bg_img_opa <= LV_OPA_MIN) return;
+
+    lv_img_src_t src_type = lv_img_src_get_type(dsc->bg_img_src);
+    if(src_type == LV_IMG_SRC_SYMBOL) {
+        lv_point_t size;
+        lv_txt_get_size(&size, dsc->bg_img_src, dsc->bg_img_symbol_font, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE);
+        lv_area_t a;
+        a.x1 = coords->x1 + lv_area_get_width(coords) / 2 - size.x / 2;
+        a.x2 = a.x1 + size.x - 1;
+        a.y1 = coords->y1 + lv_area_get_height(coords) / 2 - size.y / 2;
+        a.y2 = a.y1 + size.y - 1;
+
+        lv_draw_label_dsc_t label_draw_dsc;
+        lv_draw_label_dsc_init(&label_draw_dsc);
+        label_draw_dsc.font = dsc->bg_img_symbol_font;
+        label_draw_dsc.color = dsc->bg_img_recolor;
+        label_draw_dsc.opa = dsc->bg_img_opa;
+        lv_draw_label(draw_ctx, &label_draw_dsc, &a, dsc->bg_img_src, NULL);
+    }
+    else {
+        lv_img_header_t header;
+        lv_res_t res = lv_img_decoder_get_info(dsc->bg_img_src, &header);
+        if(res != LV_RES_OK) {
+            LV_LOG_WARN("Couldn't read the background image");
+            return;
+        }
+
+        lv_draw_img_dsc_t img_dsc;
+        lv_draw_img_dsc_init(&img_dsc);
+        img_dsc.blend_mode = dsc->blend_mode;
+        img_dsc.recolor = dsc->bg_img_recolor;
+        img_dsc.recolor_opa = dsc->bg_img_recolor_opa;
+        img_dsc.opa = dsc->bg_img_opa;
+
+        /*Center align*/
+        if(dsc->bg_img_tiled == false) {
+            lv_area_t area;
+            area.x1 = coords->x1 + lv_area_get_width(coords) / 2 - header.w / 2;
+            area.y1 = coords->y1 + lv_area_get_height(coords) / 2 - header.h / 2;
+            area.x2 = area.x1 + header.w - 1;
+            area.y2 = area.y1 + header.h - 1;
+
+            lv_draw_img(draw_ctx, &img_dsc, &area, dsc->bg_img_src);
+        }
+        else {
+            lv_area_t area;
+            area.y1 = coords->y1;
+            area.y2 = area.y1 + header.h - 1;
+
+            for(; area.y1 <= coords->y2; area.y1 += header.h, area.y2 += header.h) {
+
+                area.x1 = coords->x1;
+                area.x2 = area.x1 + header.w - 1;
+                for(; area.x1 <= coords->x2; area.x1 += header.w, area.x2 += header.w) {
+                    lv_draw_img(draw_ctx, &img_dsc, &area, dsc->bg_img_src);
+                }
+            }
+        }
+    }
+}
+
+static void draw_border(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+    if(dsc->border_opa <= LV_OPA_MIN) return;
+    if(dsc->border_width == 0) return;
+    if(dsc->border_side == LV_BORDER_SIDE_NONE) return;
+    if(dsc->border_post) return;
+
+    int32_t coords_w = lv_area_get_width(coords);
+    int32_t coords_h = lv_area_get_height(coords);
+    int32_t rout = dsc->radius;
+    int32_t short_side = LV_MIN(coords_w, coords_h);
+    if(rout > short_side >> 1) rout = short_side >> 1;
+
+    /*Get the inner area*/
+    lv_area_t area_inner;
+    lv_area_copy(&area_inner, coords);
+    area_inner.x1 += ((dsc->border_side & LV_BORDER_SIDE_LEFT) ? dsc->border_width : - (dsc->border_width + rout));
+    area_inner.x2 -= ((dsc->border_side & LV_BORDER_SIDE_RIGHT) ? dsc->border_width : - (dsc->border_width + rout));
+    area_inner.y1 += ((dsc->border_side & LV_BORDER_SIDE_TOP) ? dsc->border_width : - (dsc->border_width + rout));
+    area_inner.y2 -= ((dsc->border_side & LV_BORDER_SIDE_BOTTOM) ? dsc->border_width : - (dsc->border_width + rout));
+
+    lv_coord_t rin = rout - dsc->border_width;
+    if(rin < 0) rin = 0;
+
+    draw_border_generic(draw_ctx, coords, &area_inner, rout, rin, dsc->border_color, dsc->border_opa, dsc->blend_mode);
+
+}
+
+#if LV_DRAW_COMPLEX
+LV_ATTRIBUTE_FAST_MEM static void draw_shadow(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc,
+                                              const lv_area_t * coords)
+{
+    /*Check whether the shadow is visible*/
+    if(dsc->shadow_width == 0) return;
+    if(dsc->shadow_opa <= LV_OPA_MIN) return;
+
+    if(dsc->shadow_width == 1 && dsc->shadow_spread <= 0 &&
+       dsc->shadow_ofs_x == 0 && dsc->shadow_ofs_y == 0) {
+        return;
+    }
+
+    /*Calculate the rectangle which is blurred to get the shadow in `shadow_area`*/
+    lv_area_t core_area;
+    core_area.x1 = coords->x1  + dsc->shadow_ofs_x - dsc->shadow_spread;
+    core_area.x2 = coords->x2  + dsc->shadow_ofs_x + dsc->shadow_spread;
+    core_area.y1 = coords->y1  + dsc->shadow_ofs_y - dsc->shadow_spread;
+    core_area.y2 = coords->y2  + dsc->shadow_ofs_y + dsc->shadow_spread;
+
+    /*Calculate the bounding box of the shadow*/
+    lv_area_t shadow_area;
+    shadow_area.x1 = core_area.x1 - dsc->shadow_width / 2 - 1;
+    shadow_area.x2 = core_area.x2 + dsc->shadow_width / 2 + 1;
+    shadow_area.y1 = core_area.y1 - dsc->shadow_width / 2 - 1;
+    shadow_area.y2 = core_area.y2 + dsc->shadow_width / 2 + 1;
+
+    lv_opa_t opa = dsc->shadow_opa;
+    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
+
+    /*Get clipped draw area which is the real draw area.
+     *It is always the same or inside `shadow_area`*/
+    lv_area_t draw_area;
+    if(!_lv_area_intersect(&draw_area, &shadow_area, draw_ctx->clip_area)) return;
+
+    /*Consider 1 px smaller bg to be sure the edge will be covered by the shadow*/
+    lv_area_t bg_area;
+    lv_area_copy(&bg_area, coords);
+    lv_area_increase(&bg_area, -1, -1);
+
+    /*Get the clamped radius*/
+    int32_t r_bg = dsc->radius;
+    lv_coord_t short_side = LV_MIN(lv_area_get_width(&bg_area), lv_area_get_height(&bg_area));
+    if(r_bg > short_side >> 1) r_bg = short_side >> 1;
+
+    /*Get the clamped radius*/
+    int32_t r_sh = dsc->radius;
+    short_side = LV_MIN(lv_area_get_width(&core_area), lv_area_get_height(&core_area));
+    if(r_sh > short_side >> 1) r_sh = short_side >> 1;
+
+
+    /*Get how many pixels are affected by the blur on the corners*/
+    int32_t corner_size = dsc->shadow_width  + r_sh;
+
+    lv_opa_t * sh_buf;
+
+#if LV_SHADOW_CACHE_SIZE
+    if(sh_cache_size == corner_size && sh_cache_r == r_sh) {
+        /*Use the cache if available*/
+        sh_buf = lv_mem_buf_get(corner_size * corner_size);
+        lv_memcpy(sh_buf, sh_cache, corner_size * corner_size);
+    }
+    else {
+        /*A larger buffer is required for calculation*/
+        sh_buf = lv_mem_buf_get(corner_size * corner_size * sizeof(uint16_t));
+        shadow_draw_corner_buf(&core_area, (uint16_t *)sh_buf, dsc->shadow_width, r_sh);
+
+        /*Cache the corner if it fits into the cache size*/
+        if((uint32_t)corner_size * corner_size < sizeof(sh_cache)) {
+            lv_memcpy(sh_cache, sh_buf, corner_size * corner_size);
+            sh_cache_size = corner_size;
+            sh_cache_r = r_sh;
+        }
+    }
+#else
+    sh_buf = lv_mem_buf_get(corner_size * corner_size * sizeof(uint16_t));
+    shadow_draw_corner_buf(&core_area, (uint16_t *)sh_buf, dsc->shadow_width, r_sh);
+#endif
+
+    /*Skip a lot of masking if the background will cover the shadow that would be masked out*/
+    bool mask_any = lv_draw_mask_is_any(&shadow_area);
+    bool simple = true;
+    if(mask_any || dsc->bg_opa < LV_OPA_COVER || dsc->blend_mode != LV_BLEND_MODE_NORMAL) simple = false;
+
+    /*Create a radius mask to clip remove shadow on the bg area*/
+
+    lv_draw_mask_radius_param_t mask_rout_param;
+    int16_t mask_rout_id = LV_MASK_ID_INV;
+    if(!simple) {
+        lv_draw_mask_radius_init(&mask_rout_param, &bg_area, r_bg, true);
+        mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
+    }
+    lv_opa_t * mask_buf = lv_mem_buf_get(lv_area_get_width(&shadow_area));
+    lv_area_t blend_area;
+    lv_area_t clip_area_sub;
+    lv_opa_t * sh_buf_tmp;
+    lv_coord_t y;
+    bool simple_sub;
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.blend_area = &blend_area;
+    blend_dsc.mask_area = &blend_area;
+    blend_dsc.mask_buf = mask_buf;
+    blend_dsc.color = dsc->shadow_color;
+    blend_dsc.opa = dsc->shadow_opa;
+    blend_dsc.blend_mode = dsc->blend_mode;
+
+    lv_coord_t w_half = shadow_area.x1 + lv_area_get_width(&shadow_area) / 2;
+    lv_coord_t h_half = shadow_area.y1 + lv_area_get_height(&shadow_area) / 2;
+
+    /*Draw the corners if they are on the current clip area and not fully covered by the bg*/
+
+    /*Top right corner*/
+    blend_area.x2 = shadow_area.x2;
+    blend_area.x1 = shadow_area.x2 - corner_size + 1;
+    blend_area.y1 = shadow_area.y1;
+    blend_area.y2 = shadow_area.y1 + corner_size - 1;
+    /*Do not overdraw the other top corners*/
+    blend_area.x1 = LV_MAX(blend_area.x1, w_half);
+    blend_area.y2 = LV_MIN(blend_area.y2, h_half);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (clip_area_sub.y1 - shadow_area.y1) * corner_size;
+        sh_buf_tmp += clip_area_sub.x1 - (shadow_area.x2 - corner_size + 1);
+
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+        if(w > 0) {
+            blend_dsc.mask_buf = mask_buf;
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
+            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+                else {
+                    blend_dsc.mask_buf = sh_buf_tmp;
+                }
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                sh_buf_tmp += corner_size;
+            }
+        }
+    }
+
+    /*Bottom right corner.
+     *Almost the same as top right just read the lines of `sh_buf` from then end*/
+    blend_area.x2 = shadow_area.x2;
+    blend_area.x1 = shadow_area.x2 - corner_size + 1;
+    blend_area.y1 = shadow_area.y2 - corner_size + 1;
+    blend_area.y2 = shadow_area.y2;
+    /*Do not overdraw the other corners*/
+    blend_area.x1 = LV_MAX(blend_area.x1, w_half);
+    blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (blend_area.y2 - clip_area_sub.y2) * corner_size;
+        sh_buf_tmp += clip_area_sub.x1 - (shadow_area.x2 - corner_size + 1);
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+
+        if(w > 0) {
+            blend_dsc.mask_buf = mask_buf;
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
+            for(y = clip_area_sub.y2; y >= clip_area_sub.y1; y--) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+                else {
+                    blend_dsc.mask_buf = sh_buf_tmp;
+                }
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                sh_buf_tmp += corner_size;
+            }
+        }
+    }
+
+    /*Top side*/
+    blend_area.x1 = shadow_area.x1 + corner_size;
+    blend_area.x2 = shadow_area.x2 - corner_size;
+    blend_area.y1 = shadow_area.y1;
+    blend_area.y2 = shadow_area.y1 + corner_size - 1;
+    blend_area.y2 = LV_MIN(blend_area.y2, h_half);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (clip_area_sub.y1 - blend_area.y1) * corner_size;
+
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+
+        if(w > 0) {
+            if(!simple_sub) {
+                blend_dsc.mask_buf = mask_buf;
+            }
+            else {
+                blend_dsc.mask_buf = NULL;
+            }
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+
+            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memset(mask_buf, sh_buf_tmp[0], w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+                else {
+                    blend_dsc.opa = opa == LV_OPA_COVER ? sh_buf_tmp[0] : (sh_buf_tmp[0] * dsc->shadow_opa) >> 8;
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+                sh_buf_tmp += corner_size;
+            }
+        }
+    }
+    blend_dsc.opa = dsc->shadow_opa;    /*Restore*/
+
+    /*Bottom side*/
+    blend_area.x1 = shadow_area.x1 + corner_size;
+    blend_area.x2 = shadow_area.x2 - corner_size;
+    blend_area.y1 = shadow_area.y2 - corner_size + 1;
+    blend_area.y2 = shadow_area.y2;
+    blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1);
+
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (blend_area.y2 - clip_area_sub.y2) * corner_size;
+        if(w > 0) {
+            /*Do not mask if out of the bg*/
+            if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+            else simple_sub = simple;
+
+            if(!simple_sub) {
+                blend_dsc.mask_buf = mask_buf;
+            }
+            else {
+                blend_dsc.mask_buf = NULL;
+            }
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+
+            for(y = clip_area_sub.y2; y >= clip_area_sub.y1; y--) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                /*Do not mask if out of the bg*/
+                if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+                else simple_sub = simple;
+
+                if(!simple_sub) {
+                    lv_memset(mask_buf, sh_buf_tmp[0], w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+                else {
+                    blend_dsc.opa = opa == LV_OPA_COVER ? sh_buf_tmp[0] : (sh_buf_tmp[0] * dsc->shadow_opa) >> 8;
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+
+                }
+                sh_buf_tmp += corner_size;
+            }
+        }
+    }
+
+    blend_dsc.opa = dsc->shadow_opa;    /*Restore*/
+
+    /*Right side*/
+    blend_area.x1 = shadow_area.x2 - corner_size + 1;
+    blend_area.x2 = shadow_area.x2;
+    blend_area.y1 = shadow_area.y1 + corner_size;
+    blend_area.y2 = shadow_area.y2 - corner_size;
+    /*Do not overdraw the other corners*/
+    blend_area.y1 = LV_MIN(blend_area.y1, h_half + 1);
+    blend_area.y2 = LV_MAX(blend_area.y2, h_half);
+    blend_area.x1 = LV_MAX(blend_area.x1, w_half);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (corner_size - 1) * corner_size;
+        sh_buf_tmp += clip_area_sub.x1 - (shadow_area.x2 - corner_size + 1);
+
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+        blend_dsc.mask_buf = simple_sub ? sh_buf_tmp : mask_buf;
+
+        if(w > 0) {
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
+            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memcpy(mask_buf, sh_buf_tmp, w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+        }
+    }
+
+    /*Mirror the shadow corner buffer horizontally*/
+    sh_buf_tmp = sh_buf ;
+    for(y = 0; y < corner_size; y++) {
+        int32_t x;
+        lv_opa_t * start = sh_buf_tmp;
+        lv_opa_t * end = sh_buf_tmp + corner_size - 1;
+        for(x = 0; x < corner_size / 2; x++) {
+            lv_opa_t tmp = *start;
+            *start = *end;
+            *end = tmp;
+
+            start++;
+            end--;
+        }
+        sh_buf_tmp += corner_size;
+    }
+
+    /*Left side*/
+    blend_area.x1 = shadow_area.x1;
+    blend_area.x2 = shadow_area.x1 + corner_size - 1;
+    blend_area.y1 = shadow_area.y1 + corner_size;
+    blend_area.y2 = shadow_area.y2 - corner_size;
+    /*Do not overdraw the other corners*/
+    blend_area.y1 = LV_MIN(blend_area.y1, h_half + 1);
+    blend_area.y2 = LV_MAX(blend_area.y2, h_half);
+    blend_area.x2 = LV_MIN(blend_area.x2, w_half - 1);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (corner_size - 1) * corner_size;
+        sh_buf_tmp += clip_area_sub.x1 - blend_area.x1;
+
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+        blend_dsc.mask_buf = simple_sub ? sh_buf_tmp : mask_buf;
+        if(w > 0) {
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
+            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memcpy(mask_buf, sh_buf_tmp, w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+        }
+    }
+
+    /*Top left corner*/
+    blend_area.x1 = shadow_area.x1;
+    blend_area.x2 = shadow_area.x1 + corner_size - 1;
+    blend_area.y1 = shadow_area.y1;
+    blend_area.y2 = shadow_area.y1 + corner_size - 1;
+    /*Do not overdraw the other corners*/
+    blend_area.x2 = LV_MIN(blend_area.x2, w_half - 1);
+    blend_area.y2 = LV_MIN(blend_area.y2, h_half);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (clip_area_sub.y1 - blend_area.y1) * corner_size;
+        sh_buf_tmp += clip_area_sub.x1 - blend_area.x1;
+
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+        blend_dsc.mask_buf = mask_buf;
+
+        if(w > 0) {
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
+            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+                else {
+                    blend_dsc.mask_buf = sh_buf_tmp;
+                }
+
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                sh_buf_tmp += corner_size;
+            }
+        }
+    }
+
+    /*Bottom left corner.
+     *Almost the same as bottom right just read the lines of `sh_buf` from then end*/
+    blend_area.x1 = shadow_area.x1 ;
+    blend_area.x2 = shadow_area.x1 + corner_size - 1;
+    blend_area.y1 = shadow_area.y2 - corner_size + 1;
+    blend_area.y2 = shadow_area.y2;
+    /*Do not overdraw the other corners*/
+    blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1);
+    blend_area.x2 = LV_MIN(blend_area.x2, w_half - 1);
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        sh_buf_tmp = sh_buf;
+        sh_buf_tmp += (blend_area.y2 - clip_area_sub.y2) * corner_size;
+        sh_buf_tmp += clip_area_sub.x1 - blend_area.x1;
+
+        /*Do not mask if out of the bg*/
+        if(simple && _lv_area_is_out(&clip_area_sub, &bg_area, r_bg)) simple_sub = true;
+        else simple_sub = simple;
+        blend_dsc.mask_buf = mask_buf;
+        if(w > 0) {
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;    /*In simple mode it won't be overwritten*/
+            for(y = clip_area_sub.y2; y >= clip_area_sub.y1; y--) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                if(!simple_sub) {
+                    lv_memcpy(mask_buf, sh_buf_tmp, corner_size);
+                    blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                    if(blend_dsc.mask_res == LV_DRAW_MASK_RES_FULL_COVER) blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;
+                }
+                else {
+                    blend_dsc.mask_buf = sh_buf_tmp;
+                }
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                sh_buf_tmp += corner_size;
+            }
+        }
+    }
+
+    /*Draw the center rectangle.*/
+    blend_area.x1 = shadow_area.x1 + corner_size ;
+    blend_area.x2 = shadow_area.x2 - corner_size;
+    blend_area.y1 = shadow_area.y1 + corner_size;
+    blend_area.y2 = shadow_area.y2 - corner_size;
+    blend_dsc.mask_buf = mask_buf;
+
+    if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_ctx->clip_area) &&
+       !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) {
+        lv_coord_t w = lv_area_get_width(&clip_area_sub);
+        if(w > 0) {
+            blend_area.x1 = clip_area_sub.x1;
+            blend_area.x2 = clip_area_sub.x2;
+            for(y = clip_area_sub.y1; y <= clip_area_sub.y2; y++) {
+                blend_area.y1 = y;
+                blend_area.y2 = y;
+
+                lv_memset_ff(mask_buf, w);
+                blend_dsc.mask_res = lv_draw_mask_apply(mask_buf, clip_area_sub.x1, y, w);
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+        }
+    }
+
+    if(!simple) {
+        lv_draw_mask_free_param(&mask_rout_param);
+        lv_draw_mask_remove_id(mask_rout_id);
+    }
+    lv_mem_buf_release(sh_buf);
+    lv_mem_buf_release(mask_buf);
+}
+
+/**
+ * Calculate a blurred corner
+ * @param coords Coordinates of the shadow
+ * @param sh_buf a buffer to store the result. Its size should be `(sw + r)^2 * 2`
+ * @param sw shadow width
+ * @param r radius
+ */
+LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coords, uint16_t * sh_buf, lv_coord_t sw,
+                                                         lv_coord_t r)
+{
+    int32_t sw_ori = sw;
+    int32_t size = sw_ori  + r;
+
+    lv_area_t sh_area;
+    lv_area_copy(&sh_area, coords);
+    sh_area.x2 = sw / 2 + r - 1  - ((sw & 1) ? 0 : 1);
+    sh_area.y1 = sw / 2 + 1;
+
+    sh_area.x1 = sh_area.x2 - lv_area_get_width(coords);
+    sh_area.y2 = sh_area.y1 + lv_area_get_height(coords);
+
+    lv_draw_mask_radius_param_t mask_param;
+    lv_draw_mask_radius_init(&mask_param, &sh_area, r, false);
+
+#if SHADOW_ENHANCE
+    /*Set half shadow width width because blur will be repeated*/
+    if(sw_ori == 1) sw = 1;
+    else sw = sw_ori >> 1;
+#endif
+
+    int32_t y;
+    lv_opa_t * mask_line = lv_mem_buf_get(size);
+    uint16_t * sh_ups_tmp_buf = (uint16_t *)sh_buf;
+    for(y = 0; y < size; y++) {
+        lv_memset_ff(mask_line, size);
+        lv_draw_mask_res_t mask_res = mask_param.dsc.cb(mask_line, 0, y, size, &mask_param);
+        if(mask_res == LV_DRAW_MASK_RES_TRANSP) {
+            lv_memset_00(sh_ups_tmp_buf, size * sizeof(sh_ups_tmp_buf[0]));
+        }
+        else {
+            int32_t i;
+            sh_ups_tmp_buf[0] = (mask_line[0] << SHADOW_UPSCALE_SHIFT) / sw;
+            for(i = 1; i < size; i++) {
+                if(mask_line[i] == mask_line[i - 1]) sh_ups_tmp_buf[i] = sh_ups_tmp_buf[i - 1];
+                else  sh_ups_tmp_buf[i] = (mask_line[i] << SHADOW_UPSCALE_SHIFT) / sw;
+            }
+        }
+
+        sh_ups_tmp_buf += size;
+    }
+    lv_mem_buf_release(mask_line);
+
+    lv_draw_mask_free_param(&mask_param);
+
+    if(sw == 1) {
+        int32_t i;
+        lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
+        for(i = 0; i < size * size; i++) {
+            res_buf[i] = (sh_buf[i] >> SHADOW_UPSCALE_SHIFT);
+        }
+        return;
+    }
+
+    shadow_blur_corner(size, sw, sh_buf);
+
+#if SHADOW_ENHANCE == 0
+    /*The result is required in lv_opa_t not uint16_t*/
+    uint32_t x;
+    lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
+    for(x = 0; x < size * size; x++) {
+        res_buf[x] = sh_buf[x];
+    }
+#else
+    sw += sw_ori & 1;
+    if(sw > 1) {
+        uint32_t i;
+        uint32_t max_v_div = (LV_OPA_COVER << SHADOW_UPSCALE_SHIFT) / sw;
+        for(i = 0; i < (uint32_t)size * size; i++) {
+            if(sh_buf[i] == 0) continue;
+            else if(sh_buf[i] == LV_OPA_COVER) sh_buf[i] = max_v_div;
+            else  sh_buf[i] = (sh_buf[i] << SHADOW_UPSCALE_SHIFT) / sw;
+        }
+
+        shadow_blur_corner(size, sw, sh_buf);
+    }
+    int32_t x;
+    lv_opa_t * res_buf = (lv_opa_t *)sh_buf;
+    for(x = 0; x < size * size; x++) {
+        res_buf[x] = sh_buf[x];
+    }
+#endif
+
+}
+
+LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, uint16_t * sh_ups_buf)
+{
+    int32_t s_left = sw >> 1;
+    int32_t s_right = (sw >> 1);
+    if((sw & 1) == 0) s_left--;
+
+    /*Horizontal blur*/
+    uint16_t * sh_ups_blur_buf = lv_mem_buf_get(size * sizeof(uint16_t));
+
+    int32_t x;
+    int32_t y;
+
+    uint16_t * sh_ups_tmp_buf = sh_ups_buf;
+
+    for(y = 0; y < size; y++) {
+        int32_t v = sh_ups_tmp_buf[size - 1] * sw;
+        for(x = size - 1; x >= 0; x--) {
+            sh_ups_blur_buf[x] = v;
+
+            /*Forget the right pixel*/
+            uint32_t right_val = 0;
+            if(x + s_right < size) right_val = sh_ups_tmp_buf[x + s_right];
+            v -= right_val;
+
+            /*Add the left pixel*/
+            uint32_t left_val;
+            if(x - s_left - 1 < 0) left_val = sh_ups_tmp_buf[0];
+            else left_val = sh_ups_tmp_buf[x - s_left - 1];
+            v += left_val;
+        }
+        lv_memcpy(sh_ups_tmp_buf, sh_ups_blur_buf, size * sizeof(uint16_t));
+        sh_ups_tmp_buf += size;
+    }
+
+    /*Vertical blur*/
+    uint32_t i;
+    uint32_t max_v = LV_OPA_COVER << SHADOW_UPSCALE_SHIFT;
+    uint32_t max_v_div = max_v / sw;
+    for(i = 0; i < (uint32_t)size * size; i++) {
+        if(sh_ups_buf[i] == 0) continue;
+        else if(sh_ups_buf[i] == max_v) sh_ups_buf[i] = max_v_div;
+        else sh_ups_buf[i] = sh_ups_buf[i] / sw;
+    }
+
+    for(x = 0; x < size; x++) {
+        sh_ups_tmp_buf = &sh_ups_buf[x];
+        int32_t v = sh_ups_tmp_buf[0] * sw;
+        for(y = 0; y < size ; y++, sh_ups_tmp_buf += size) {
+            sh_ups_blur_buf[y] = v < 0 ? 0 : (v >> SHADOW_UPSCALE_SHIFT);
+
+            /*Forget the top pixel*/
+            uint32_t top_val;
+            if(y - s_right <= 0) top_val = sh_ups_tmp_buf[0];
+            else top_val = sh_ups_buf[(y - s_right) * size + x];
+            v -= top_val;
+
+            /*Add the bottom pixel*/
+            uint32_t bottom_val;
+            if(y + s_left + 1 < size) bottom_val = sh_ups_buf[(y + s_left + 1) * size + x];
+            else bottom_val = sh_ups_buf[(size - 1) * size + x];
+            v += bottom_val;
+        }
+
+        /*Write back the result into `sh_ups_buf`*/
+        sh_ups_tmp_buf = &sh_ups_buf[x];
+        for(y = 0; y < size; y++, sh_ups_tmp_buf += size) {
+            (*sh_ups_tmp_buf) = sh_ups_blur_buf[y];
+        }
+    }
+
+    lv_mem_buf_release(sh_ups_blur_buf);
+}
+#endif
+
+static void draw_outline(lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords)
+{
+    if(dsc->outline_opa <= LV_OPA_MIN) return;
+    if(dsc->outline_width == 0) return;
+
+    lv_opa_t opa = dsc->outline_opa;
+
+    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
+
+    /*Get the inner radius*/
+    lv_area_t area_inner;
+    lv_area_copy(&area_inner, coords);
+
+    /*Bring the outline closer to make sure there is no color bleeding with pad=0*/
+    lv_coord_t pad = dsc->outline_pad - 1;
+    area_inner.x1 -= pad;
+    area_inner.y1 -= pad;
+    area_inner.x2 += pad;
+    area_inner.y2 += pad;
+
+    lv_area_t area_outer;
+    lv_area_copy(&area_outer, &area_inner);
+
+    area_outer.x1 -= dsc->outline_width;
+    area_outer.x2 += dsc->outline_width;
+    area_outer.y1 -= dsc->outline_width;
+    area_outer.y2 += dsc->outline_width;
+
+
+    int32_t inner_w = lv_area_get_width(&area_inner);
+    int32_t inner_h = lv_area_get_height(&area_inner);
+    int32_t rin = dsc->radius;
+    int32_t short_side = LV_MIN(inner_w, inner_h);
+    if(rin > short_side >> 1) rin = short_side >> 1;
+
+    lv_coord_t rout = rin + dsc->outline_width;
+
+    draw_border_generic(draw_ctx, &area_outer, &area_inner, rout, rin, dsc->outline_color, dsc->outline_opa,
+                        dsc->blend_mode);
+}
+
+void draw_border_generic(lv_draw_ctx_t * draw_ctx, const lv_area_t * outer_area, const lv_area_t * inner_area,
+                         lv_coord_t rout, lv_coord_t rin, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
+{
+    opa = opa >= LV_OPA_COVER ? LV_OPA_COVER : opa;
+
+    bool mask_any = lv_draw_mask_is_any(outer_area);
+
+    if(!mask_any && rout == 0 && rin == 0) {
+        draw_border_simple(draw_ctx, outer_area, inner_area, color, opa);
+        return;
+    }
+
+#if LV_DRAW_COMPLEX
+    /*Get clipped draw area which is the real draw area.
+     *It is always the same or inside `coords`*/
+    lv_area_t draw_area;
+    if(!_lv_area_intersect(&draw_area, outer_area, draw_ctx->clip_area)) return;
+    int32_t draw_area_w = lv_area_get_width(&draw_area);
+
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(blend_dsc));
+    blend_dsc.mask_buf = lv_mem_buf_get(draw_area_w);;
+
+
+    /*Create mask for the outer area*/
+    int16_t mask_rout_id = LV_MASK_ID_INV;
+    lv_draw_mask_radius_param_t mask_rout_param;
+    if(rout > 0) {
+        lv_draw_mask_radius_init(&mask_rout_param, outer_area, rout, false);
+        mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
+    }
+
+    /*Create mask for the inner mask*/
+    lv_draw_mask_radius_param_t mask_rin_param;
+    lv_draw_mask_radius_init(&mask_rin_param, inner_area, rin, true);
+    int16_t mask_rin_id = lv_draw_mask_add(&mask_rin_param, NULL);
+
+    int32_t h;
+    lv_area_t blend_area;
+    blend_dsc.blend_area = &blend_area;
+    blend_dsc.mask_area = &blend_area;
+    blend_dsc.color = color;
+    blend_dsc.opa = opa;
+    blend_dsc.blend_mode = blend_mode;
+
+    /*Calculate the x and y coordinates where the straight parts area*/
+    lv_area_t core_area;
+    core_area.x1 = LV_MAX(outer_area->x1 + rout, inner_area->x1);
+    core_area.x2 = LV_MIN(outer_area->x2 - rout, inner_area->x2);
+    core_area.y1 = LV_MAX(outer_area->y1 + rout, inner_area->y1);
+    core_area.y2 = LV_MIN(outer_area->y2 - rout, inner_area->y2);
+    lv_coord_t core_w = lv_area_get_width(&core_area);
+
+    bool top_side = outer_area->y1 <= inner_area->y1 ? true : false;
+    bool bottom_side = outer_area->y2 >= inner_area->y2 ? true : false;
+
+    /*If there is other masks, need to draw line by line*/
+    if(mask_any) {
+        blend_area.x1 = draw_area.x1;
+        blend_area.x2 = draw_area.x2;
+        for(h = draw_area.y1; h <= draw_area.y2; h++) {
+            if(!top_side && h < core_area.y1) continue;
+            if(!bottom_side && h > core_area.y2) break;
+
+            blend_area.y1 = h;
+            blend_area.y2 = h;
+
+            lv_memset_ff(blend_dsc.mask_buf, draw_area_w);
+            blend_dsc.mask_res = lv_draw_mask_apply(blend_dsc.mask_buf, draw_area.x1, h, draw_area_w);
+            lv_draw_sw_blend(draw_ctx, &blend_dsc);
+        }
+
+        lv_draw_mask_free_param(&mask_rin_param);
+        lv_draw_mask_remove_id(mask_rin_id);
+        if(mask_rout_id != LV_MASK_ID_INV) {
+            lv_draw_mask_free_param(&mask_rout_param);
+            lv_draw_mask_remove_id(mask_rout_id);
+        }
+        lv_mem_buf_release(blend_dsc.mask_buf);
+        return;
+    }
+
+    /*No masks*/
+    bool left_side = outer_area->x1 <= inner_area->x1 ? true : false;
+    bool right_side = outer_area->x2 >= inner_area->x2 ? true : false;
+
+    bool split_hor = true;
+    if(left_side && right_side && top_side && bottom_side &&
+       core_w < SPLIT_LIMIT) {
+        split_hor = false;
+    }
+
+    blend_dsc.mask_res = LV_DRAW_MASK_RES_FULL_COVER;
+    /*Draw the straight lines first if they are long enough*/
+    if(top_side && split_hor) {
+        blend_area.x1 = core_area.x1;
+        blend_area.x2 = core_area.x2;
+        blend_area.y1 = outer_area->y1;
+        blend_area.y2 = inner_area->y1 - 1;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    if(bottom_side && split_hor) {
+        blend_area.x1 = core_area.x1;
+        blend_area.x2 = core_area.x2;
+        blend_area.y1 = inner_area->y2 + 1;
+        blend_area.y2 = outer_area->y2;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    if(left_side) {
+        blend_area.x1 = outer_area->x1;
+        blend_area.x2 = inner_area->x1 - 1;
+        blend_area.y1 = core_area.y1;
+        blend_area.y2 = core_area.y2;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    if(right_side) {
+        blend_area.x1 = inner_area->x2 + 1;
+        blend_area.x2 = outer_area->x2;
+        blend_area.y1 = core_area.y1;
+        blend_area.y2 = core_area.y2;
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    /*Draw the corners*/
+    lv_coord_t blend_w;
+
+    /*Left and right corner together is they close to eachother*/
+    if(!split_hor) {
+        /*Calculate the top corner and mirror it to the bottom*/
+        blend_area.x1 = draw_area.x1;
+        blend_area.x2 = draw_area.x2;
+        lv_coord_t max_h = LV_MAX(rout, outer_area->y1 - inner_area->y1);
+        for(h = 0; h < max_h; h++) {
+            lv_coord_t top_y = outer_area->y1 + h;
+            lv_coord_t bottom_y = outer_area->y2 - h;
+            if(top_y < draw_area.y1 && bottom_y > draw_area.y2) continue;   /*This line is clipped now*/
+
+            lv_memset_ff(blend_dsc.mask_buf, draw_area_w);
+            blend_dsc.mask_res = lv_draw_mask_apply(blend_dsc.mask_buf, blend_area.x1, top_y, draw_area_w);
+
+            if(top_y >= draw_area.y1) {
+                blend_area.y1 = top_y;
+                blend_area.y2 = top_y;
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+
+            if(bottom_y <= draw_area.y2) {
+                blend_area.y1 = bottom_y;
+                blend_area.y2 = bottom_y;
+                lv_draw_sw_blend(draw_ctx, &blend_dsc);
+            }
+        }
+    }
+    else {
+        /*Left corners*/
+        blend_area.x1 = draw_area.x1;
+        blend_area.x2 = LV_MIN(draw_area.x2, core_area.x1 - 1);
+        blend_w = lv_area_get_width(&blend_area);
+        if(blend_w > 0) {
+            if(left_side || top_side) {
+                for(h = draw_area.y1; h < core_area.y1; h++) {
+                    blend_area.y1 = h;
+                    blend_area.y2 = h;
+
+                    lv_memset_ff(blend_dsc.mask_buf, blend_w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(blend_dsc.mask_buf, blend_area.x1, h, blend_w);
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+            }
+
+            if(left_side || bottom_side) {
+                for(h = core_area.y2 + 1; h <= draw_area.y2; h++) {
+                    blend_area.y1 = h;
+                    blend_area.y2 = h;
+
+                    lv_memset_ff(blend_dsc.mask_buf, blend_w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(blend_dsc.mask_buf, blend_area.x1, h, blend_w);
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+            }
+        }
+
+        /*Right corners*/
+        blend_area.x1 = LV_MAX(draw_area.x1, core_area.x2 + 1);
+        blend_area.x2 = draw_area.x2;
+        blend_w = lv_area_get_width(&blend_area);
+
+        if(blend_w > 0) {
+            if(right_side || top_side) {
+                for(h = draw_area.y1; h < core_area.y1; h++) {
+                    blend_area.y1 = h;
+                    blend_area.y2 = h;
+
+                    lv_memset_ff(blend_dsc.mask_buf, blend_w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(blend_dsc.mask_buf, blend_area.x1, h, blend_w);
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+            }
+
+            if(right_side || bottom_side) {
+                for(h = core_area.y2 + 1; h <= draw_area.y2; h++) {
+                    blend_area.y1 = h;
+                    blend_area.y2 = h;
+
+                    lv_memset_ff(blend_dsc.mask_buf, blend_w);
+                    blend_dsc.mask_res = lv_draw_mask_apply(blend_dsc.mask_buf, blend_area.x1, h, blend_w);
+                    lv_draw_sw_blend(draw_ctx, &blend_dsc);
+                }
+            }
+        }
+    }
+
+    lv_draw_mask_free_param(&mask_rin_param);
+    lv_draw_mask_remove_id(mask_rin_id);
+    lv_draw_mask_free_param(&mask_rout_param);
+    lv_draw_mask_remove_id(mask_rout_id);
+    lv_mem_buf_release(blend_dsc.mask_buf);
+
+#else /*LV_DRAW_COMPLEX*/
+    LV_UNUSED(blend_mode);
+#endif /*LV_DRAW_COMPLEX*/
+}
+static void draw_border_simple(lv_draw_ctx_t * draw_ctx, const lv_area_t * outer_area, const lv_area_t * inner_area,
+                               lv_color_t color, lv_opa_t opa)
+{
+    lv_area_t a;
+    lv_draw_sw_blend_dsc_t blend_dsc;
+    lv_memset_00(&blend_dsc, sizeof(lv_draw_sw_blend_dsc_t));
+    blend_dsc.blend_area = &a;
+    blend_dsc.color = color;
+    blend_dsc.opa = opa;
+
+    bool top_side = outer_area->y1 <= inner_area->y1 ? true : false;
+    bool bottom_side = outer_area->y2 >= inner_area->y2 ? true : false;
+    bool left_side = outer_area->x1 <= inner_area->x1 ? true : false;
+    bool right_side = outer_area->x2 >= inner_area->x2 ? true : false;
+
+
+    /*Top*/
+    a.x1 = outer_area->x1;
+    a.x2 = outer_area->x2;
+    a.y1 = outer_area->y1;
+    a.y2 = inner_area->y1 - 1;
+    if(top_side) {
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    /*Bottom*/
+    a.y1 = inner_area->y2 + 1;
+    a.y2 = outer_area->y2;
+    if(bottom_side) {
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    /*Left*/
+    a.x1 = outer_area->x1;
+    a.x2 = inner_area->x1 - 1;
+    a.y1 = (top_side) ? inner_area->y1 : outer_area->y1;
+    a.y2 = (bottom_side) ? inner_area->y2 : outer_area->y2;
+    if(left_side) {
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+
+    /*Right*/
+    a.x1 = inner_area->x2 + 1;
+    a.x2 = outer_area->x2;
+    if(right_side) {
+        lv_draw_sw_blend(draw_ctx, &blend_dsc);
+    }
+}
+
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/README.md b/lib/libesp32_lvgl/lvgl/src/extra/README.md
index bd564a74c..11742114d 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/README.md
+++ b/lib/libesp32_lvgl/lvgl/src/extra/README.md
@@ -22,9 +22,10 @@ Here some ideas as inspiration feel free to contribute with ideas too.
 - Ruler, horizontal or vertical with major and minor ticks and labels
 - New [List items types](https://github.com/lvgl/lvgl/tree/master/src/extra/widgets/list)
 - [Preloaders](https://www.google.com/search?q=preloader&sxsrf=ALeKk01ddA4YB0WEgLLN1bZNSm8YER7pkg:1623080551559&source=lnms&tbm=isch&sa=X&ved=2ahUKEwiwoN6d7oXxAhVuw4sKHVedBB4Q_AUoAXoECAEQAw&biw=952&bih=940)
-- Drop-down list with a container to which an content can be added
+- Drop-down list with a container to which content can be added
 - 9 patch button: Similar to [lv_imgbtn](https://docs.lvgl.io/8.0/widgets/extra/imgbtn.html) but 9 images for 4 corner, 4 sides and the center
 
 ## Contributors
 - lv_animimg: @ZhaoQiang-b45475
 - lv_span: @guoweilkd 
+- lv_menu: @HX2003
\ No newline at end of file
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.c b/lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.c
index 7538ae4ae..118034273 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.c
@@ -54,8 +54,8 @@ typedef struct {
  *  STATIC PROTOTYPES
  **********************/
 static void flex_update(lv_obj_t * cont, void * user_data);
-static int32_t find_track_end(lv_obj_t * cont, flex_t * f, int32_t item_start_id, lv_coord_t item_gap,
-                              lv_coord_t max_main_size, track_t * t);
+static int32_t find_track_end(lv_obj_t * cont, flex_t * f, int32_t item_start_id, lv_coord_t max_main_size,
+                              lv_coord_t item_gap, track_t * t);
 static void children_repos(lv_obj_t * cont, flex_t * f, int32_t item_first_id, int32_t item_last_id, lv_coord_t abs_x,
                            lv_coord_t abs_y, lv_coord_t max_main_size, lv_coord_t item_gap, track_t * t);
 static void place_content(lv_flex_align_t place, lv_coord_t max_size, lv_coord_t content_size, lv_coord_t item_cnt,
@@ -274,7 +274,7 @@ static void flex_update(lv_obj_t * cont, void * user_data)
         place_content(track_cross_place, max_cross_size, total_track_cross_size, track_cnt, cross_pos, &gap);
     }
 
-    track_first_item =  f.rev ? cont->spec_attr->child_cnt - 1 : 0;
+    track_first_item = f.rev ? cont->spec_attr->child_cnt - 1 : 0;
 
     if(rtl && !f.row) {
         *cross_pos += total_track_cross_size;
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.c b/lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.c
index 027f6af31..6812a04a2 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.c
@@ -420,7 +420,7 @@ static void calc(lv_obj_t * cont, _lv_grid_calc_t * calc_out)
 
 /**
  * Free the a grid calculation's data
- * @param calc pointer to the calculated gtrid cell coordinates
+ * @param calc pointer to the calculated grid cell coordinates
  */
 static void calc_free(_lv_grid_calc_t * calc)
 {
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.c
index 96f68af21..4bf660222 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.c
@@ -14,6 +14,8 @@
 #include FT_GLYPH_H
 #include FT_CACHE_H
 #include FT_SIZES_H
+#include FT_IMAGE_H
+#include FT_OUTLINE_H
 
 /*********************
  *      DEFINES
@@ -22,18 +24,20 @@
 /**********************
  *      TYPEDEFS
  **********************/
-typedef struct {
-    char * name;
-} lv_face_info_t;
-
 typedef struct {
     lv_ll_t  face_ll;
 } lv_faces_control_t;
 
+typedef struct name_refer_t {
+    const char * name;  /* point to font name string */
+    int32_t cnt;        /* reference count */
+} name_refer_t;
+
 typedef struct {
-#if LV_FREETYPE_CACHE_SIZE >= 0
-    void * face_id;
-#else
+    const void * mem;
+    const char * name;
+    size_t mem_size;
+#if LV_FREETYPE_CACHE_SIZE < 0
     FT_Size     size;
 #endif
     lv_font_t * font;
@@ -49,8 +53,6 @@ static FT_Error font_face_requester(FTC_FaceID face_id,
                                     FT_Library library_is, FT_Pointer req_data, FT_Face * aface);
 static bool lv_ft_font_init_cache(lv_ft_info_t * info);
 static void lv_ft_font_destroy_cache(lv_font_t * font);
-static bool lv_ft_font_init_cache(lv_ft_info_t * info);
-static void lv_ft_font_destroy_cache(lv_font_t * font);
 #else
 static FT_Face face_find_in_list(lv_ft_info_t * info);
 static void face_add_to_list(FT_Face face);
@@ -60,16 +62,29 @@ static bool lv_ft_font_init_nocache(lv_ft_info_t * info);
 static void lv_ft_font_destroy_nocache(lv_font_t * font);
 #endif
 
+static const char * name_refer_save(const char * name);
+static void name_refer_del(const char * name);
+static const char * name_refer_find(const char * name);
+
 /**********************
 *  STATIC VARIABLES
 **********************/
 static FT_Library library;
+static lv_ll_t names_ll;
 
 #if LV_FREETYPE_CACHE_SIZE >= 0
     static FTC_Manager cache_manager;
     static FTC_CMapCache cmap_cache;
-    static FTC_SBitCache sbit_cache;
-    static FTC_SBit sbit;
+    static FT_Face current_face = NULL;
+
+    #if LV_FREETYPE_SBIT_CACHE
+        static FTC_SBitCache sbit_cache;
+        static FTC_SBit sbit;
+    #else
+        static FTC_ImageCache image_cache;
+        static FT_Glyph       image_glyph;
+    #endif
+
 #else
     static lv_faces_control_t face_control;
 #endif
@@ -90,6 +105,8 @@ bool lv_freetype_init(uint16_t max_faces, uint16_t max_sizes, uint32_t max_bytes
         return false;
     }
 
+    _lv_ll_init(&names_ll, sizeof(name_refer_t));
+
 #if LV_FREETYPE_CACHE_SIZE >= 0
     error = FTC_Manager_New(library, max_faces, max_sizes,
                             max_bytes, font_face_requester, NULL, &cache_manager);
@@ -105,11 +122,19 @@ bool lv_freetype_init(uint16_t max_faces, uint16_t max_sizes, uint32_t max_bytes
         goto Fail;
     }
 
+#if LV_FREETYPE_SBIT_CACHE
     error = FTC_SBitCache_New(cache_manager, &sbit_cache);
     if(error) {
         LV_LOG_ERROR("Failed to open sbit cache");
         goto Fail;
     }
+#else
+    error = FTC_ImageCache_New(cache_manager, &image_cache);
+    if(error) {
+        LV_LOG_ERROR("Failed to open image cache");
+        goto Fail;
+    }
+#endif
 
     return true;
 Fail:
@@ -162,8 +187,14 @@ static FT_Error font_face_requester(FTC_FaceID face_id,
     LV_UNUSED(library_is);
     LV_UNUSED(req_data);
 
-    lv_face_info_t * info = (lv_face_info_t *)face_id;
-    FT_Error error = FT_New_Face(library, info->name, 0, aface);
+    lv_font_fmt_ft_dsc_t * dsc = (lv_font_fmt_ft_dsc_t *)face_id;
+    FT_Error error;
+    if(dsc->mem) {
+        error = FT_New_Memory_Face(library, dsc->mem, dsc->mem_size, 0, aface);
+    }
+    else {
+        error = FT_New_Face(library, dsc->name, 0, aface);
+    }
     if(error) {
         LV_LOG_ERROR("FT_New_Face error:%d\n", error);
         return error;
@@ -171,6 +202,36 @@ static FT_Error font_face_requester(FTC_FaceID face_id,
     return FT_Err_Ok;
 }
 
+static bool get_bold_glyph(const lv_font_t * font, FT_Face face,
+                           FT_UInt glyph_index, lv_font_glyph_dsc_t * dsc_out)
+{
+    if(FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT)) {
+        return false;
+    }
+
+    lv_font_fmt_ft_dsc_t * dsc = (lv_font_fmt_ft_dsc_t *)(font->dsc);
+    if(face->glyph->format == FT_GLYPH_FORMAT_OUTLINE) {
+        if(dsc->style & FT_FONT_STYLE_BOLD) {
+            int strength = 1 << 6;
+            FT_Outline_Embolden(&face->glyph->outline, strength);
+        }
+    }
+
+    if(FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL)) {
+        return false;
+    }
+
+    dsc_out->adv_w = (face->glyph->metrics.horiAdvance >> 6);
+    dsc_out->box_h = face->glyph->bitmap.rows;         /*Height of the bitmap in [px]*/
+    dsc_out->box_w = face->glyph->bitmap.width;         /*Width of the bitmap in [px]*/
+    dsc_out->ofs_x = face->glyph->bitmap_left;         /*X offset of the bitmap in [pf]*/
+    dsc_out->ofs_y = face->glyph->bitmap_top -
+                     face->glyph->bitmap.rows;         /*Y offset of the bitmap measured from the as line*/
+    dsc_out->bpp = 8;         /*Bit per pixel: 1/2/4/8*/
+
+    return true;
+}
+
 static bool get_glyph_dsc_cb_cache(const lv_font_t * font,
                                    lv_font_glyph_dsc_t * dsc_out, uint32_t unicode_letter, uint32_t unicode_letter_next)
 {
@@ -187,20 +248,51 @@ static bool get_glyph_dsc_cb_cache(const lv_font_t * font,
 
     lv_font_fmt_ft_dsc_t * dsc = (lv_font_fmt_ft_dsc_t *)(font->dsc);
 
-    FT_Face face;
-    FTC_ImageTypeRec desc_sbit_type;
-    FTC_FaceID face_id = (FTC_FaceID)dsc->face_id;
-    FTC_Manager_LookupFace(cache_manager, face_id, &face);
+    FTC_FaceID face_id = (FTC_FaceID)dsc;
+    FT_Size face_size;
+    struct FTC_ScalerRec_ scaler;
+    scaler.face_id = face_id;
+    scaler.width = dsc->height;
+    scaler.height = dsc->height;
+    scaler.pixel = 1;
+    if(FTC_Manager_LookupSize(cache_manager, &scaler, &face_size) != 0) {
+        return false;
+    }
 
-    desc_sbit_type.face_id = face_id;
-    desc_sbit_type.flags = FT_LOAD_RENDER | FT_LOAD_TARGET_NORMAL;
-    desc_sbit_type.height = dsc->height;
-    desc_sbit_type.width = dsc->height;
+    FT_Face face = face_size->face;
     FT_UInt charmap_index = FT_Get_Charmap_Index(face->charmap);
     FT_UInt glyph_index = FTC_CMapCache_Lookup(cmap_cache, face_id, charmap_index, unicode_letter);
-    FT_Error error = FTC_SBitCache_Lookup(sbit_cache, &desc_sbit_type, glyph_index, &sbit, NULL);
+    dsc_out->is_placeholder = glyph_index == 0;
+
+    if(dsc->style & FT_FONT_STYLE_ITALIC) {
+        FT_Matrix italic_matrix;
+        italic_matrix.xx = 1 << 16;
+        italic_matrix.xy = 0x5800;
+        italic_matrix.yx = 0;
+        italic_matrix.yy = 1 << 16;
+        FT_Set_Transform(face, &italic_matrix, NULL);
+    }
+
+    if(dsc->style & FT_FONT_STYLE_BOLD) {
+        current_face = face;
+        if(!get_bold_glyph(font, face, glyph_index, dsc_out)) {
+            current_face = NULL;
+            return false;
+        }
+        goto end;
+    }
+
+    FTC_ImageTypeRec desc_type;
+    desc_type.face_id = face_id;
+    desc_type.flags = FT_LOAD_RENDER | FT_LOAD_TARGET_NORMAL;
+    desc_type.height = dsc->height;
+    desc_type.width = dsc->height;
+
+#if LV_FREETYPE_SBIT_CACHE
+    FT_Error error = FTC_SBitCache_Lookup(sbit_cache, &desc_type, glyph_index, &sbit, NULL);
     if(error) {
         LV_LOG_ERROR("SBitCache_Lookup error");
+        return false;
     }
 
     dsc_out->adv_w = sbit->xadvance;
@@ -209,50 +301,78 @@ static bool get_glyph_dsc_cb_cache(const lv_font_t * font,
     dsc_out->ofs_x = sbit->left;    /*X offset of the bitmap in [pf]*/
     dsc_out->ofs_y = sbit->top - sbit->height; /*Y offset of the bitmap measured from the as line*/
     dsc_out->bpp = 8;               /*Bit per pixel: 1/2/4/8*/
+#else
+    FT_Error error = FTC_ImageCache_Lookup(image_cache, &desc_type, glyph_index, &image_glyph, NULL);
+    if(error) {
+        LV_LOG_ERROR("ImageCache_Lookup error");
+        return false;
+    }
+    if(image_glyph->format != FT_GLYPH_FORMAT_BITMAP) {
+        LV_LOG_ERROR("Glyph_To_Bitmap error");
+        return false;
+    }
+
+    FT_BitmapGlyph glyph_bitmap = (FT_BitmapGlyph)image_glyph;
+    dsc_out->adv_w = (glyph_bitmap->root.advance.x >> 16);
+    dsc_out->box_h = glyph_bitmap->bitmap.rows;         /*Height of the bitmap in [px]*/
+    dsc_out->box_w = glyph_bitmap->bitmap.width;        /*Width of the bitmap in [px]*/
+    dsc_out->ofs_x = glyph_bitmap->left;                /*X offset of the bitmap in [pf]*/
+    dsc_out->ofs_y = glyph_bitmap->top -
+                     glyph_bitmap->bitmap.rows;         /*Y offset of the bitmap measured from the as line*/
+    dsc_out->bpp = 8;         /*Bit per pixel: 1/2/4/8*/
+#endif
+
+end:
+    if((dsc->style & FT_FONT_STYLE_ITALIC) && (unicode_letter_next == '\0')) {
+        dsc_out->adv_w = dsc_out->box_w + dsc_out->ofs_x;
+    }
 
     return true;
 }
 
 static const uint8_t * get_glyph_bitmap_cb_cache(const lv_font_t * font, uint32_t unicode_letter)
 {
-    LV_UNUSED(font);
     LV_UNUSED(unicode_letter);
+
+    lv_font_fmt_ft_dsc_t * dsc = (lv_font_fmt_ft_dsc_t *)(font->dsc);
+    if(dsc->style & FT_FONT_STYLE_BOLD) {
+        if(current_face && current_face->glyph->format == FT_GLYPH_FORMAT_BITMAP) {
+            return (const uint8_t *)(current_face->glyph->bitmap.buffer);
+        }
+        return NULL;
+    }
+
+#if LV_FREETYPE_SBIT_CACHE
     return (const uint8_t *)sbit->buffer;
+#else
+    FT_BitmapGlyph glyph_bitmap = (FT_BitmapGlyph)image_glyph;
+    return (const uint8_t *)glyph_bitmap->bitmap.buffer;
+#endif
 }
 
 static bool lv_ft_font_init_cache(lv_ft_info_t * info)
 {
-    lv_font_fmt_ft_dsc_t * dsc = lv_mem_alloc(sizeof(lv_font_fmt_ft_dsc_t));
+    size_t need_size = sizeof(lv_font_fmt_ft_dsc_t) + sizeof(lv_font_t);
+    lv_font_fmt_ft_dsc_t * dsc = lv_mem_alloc(need_size);
     if(dsc == NULL) return false;
+    lv_memset_00(dsc, need_size);
 
-    dsc->font = lv_mem_alloc(sizeof(lv_font_t));
-    if(dsc->font == NULL) {
-        lv_mem_free(dsc);
-        return false;
-    }
-
-    lv_face_info_t * face_info = NULL;
-    face_info = lv_mem_alloc(sizeof(lv_face_info_t) + strlen(info->name) + 1);
-    if(face_info == NULL) {
-        goto Fail;
-    }
-    face_info->name = ((char *)face_info) + sizeof(lv_face_info_t);
-    strcpy(face_info->name, info->name);
-
-    dsc->face_id = face_info;
+    dsc->font = (lv_font_t *)(((char *)dsc) + sizeof(lv_font_fmt_ft_dsc_t));
+    dsc->mem = info->mem;
+    dsc->mem_size = info->mem_size;
+    dsc->name = name_refer_save(info->name);
     dsc->height = info->weight;
     dsc->style = info->style;
 
     /* use to get font info */
     FT_Size face_size;
     struct FTC_ScalerRec_ scaler;
-    scaler.face_id = (FTC_FaceID)dsc->face_id;
+    scaler.face_id = (FTC_FaceID)dsc;
     scaler.width = info->weight;
     scaler.height = info->weight;
     scaler.pixel = 1;
     FT_Error error = FTC_Manager_LookupSize(cache_manager, &scaler, &face_size);
     if(error) {
-        lv_mem_free(face_info);
         LV_LOG_ERROR("Failed to LookupSize");
         goto Fail;
     }
@@ -276,7 +396,6 @@ static bool lv_ft_font_init_cache(lv_ft_info_t * info)
     return true;
 
 Fail:
-    lv_mem_free(dsc->font);
     lv_mem_free(dsc);
     return false;
 }
@@ -289,21 +408,20 @@ void lv_ft_font_destroy_cache(lv_font_t * font)
 
     lv_font_fmt_ft_dsc_t * dsc = (lv_font_fmt_ft_dsc_t *)(font->dsc);
     if(dsc) {
-        lv_mem_free(dsc->face_id);
-        lv_mem_free(dsc->font);
+        FTC_Manager_RemoveFaceID(cache_manager, (FTC_FaceID)dsc);
+        name_refer_del(dsc->name);
         lv_mem_free(dsc);
     }
 }
-
 #else/* LV_FREETYPE_CACHE_SIZE */
 
 static FT_Face face_find_in_list(lv_ft_info_t * info)
 {
-    lv_face_info_t * face_info;
+    lv_font_fmt_ft_dsc_t * dsc;
     FT_Face * pface = _lv_ll_get_head(&face_control.face_ll);
     while(pface) {
-        face_info = (lv_face_info_t *)(*pface)->generic.data;
-        if(strcmp(face_info->name, info->name) == 0) {
+        dsc = (lv_font_fmt_ft_dsc_t *)(*pface)->generic.data;
+        if(strcmp(dsc->name, info->name) == 0) {
             return *pface;
         }
         pface = _lv_ll_get_next(&face_control.face_ll, pface);
@@ -336,10 +454,6 @@ static void face_generic_finalizer(void * object)
 {
     FT_Face face = (FT_Face)object;
     face_remove_from_list(face);
-    if(face->generic.data) {
-        lv_face_info_t * face_info = (lv_face_info_t *)face->generic.data;
-        lv_mem_free(face_info);
-    }
     LV_LOG_INFO("face finalizer(%p)\n", face);
 }
 
@@ -366,12 +480,29 @@ static bool get_glyph_dsc_cb_nocache(const lv_font_t * font,
     if(face->size != dsc->size) {
         FT_Activate_Size(dsc->size);
     }
+    dsc_out->is_placeholder = glyph_index == 0;
 
     error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
     if(error) {
         return false;
     }
 
+    if(face->glyph->format == FT_GLYPH_FORMAT_OUTLINE) {
+        if(dsc->style & FT_FONT_STYLE_BOLD) {
+            int strength = 1 << 6;
+            FT_Outline_Embolden(&face->glyph->outline, strength);
+        }
+
+        if(dsc->style & FT_FONT_STYLE_ITALIC) {
+            FT_Matrix italic_matrix;
+            italic_matrix.xx = 1 << 16;
+            italic_matrix.xy = 0x5800;
+            italic_matrix.yx = 0;
+            italic_matrix.yy = 1 << 16;
+            FT_Outline_Transform(&face->glyph->outline, &italic_matrix);
+        }
+    }
+
     error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
     if(error) {
         return false;
@@ -385,6 +516,10 @@ static bool get_glyph_dsc_cb_nocache(const lv_font_t * font,
                      face->glyph->bitmap.rows;         /*Y offset of the bitmap measured from the as line*/
     dsc_out->bpp = 8;         /*Bit per pixel: 1/2/4/8*/
 
+    if((dsc->style & FT_FONT_STYLE_ITALIC) && (unicode_letter_next == '\0')) {
+        dsc_out->adv_w = dsc_out->box_w + dsc_out->ofs_x;
+    }
+
     return true;
 }
 
@@ -398,33 +533,34 @@ static const uint8_t * get_glyph_bitmap_cb_nocache(const lv_font_t * font, uint3
 
 static bool lv_ft_font_init_nocache(lv_ft_info_t * info)
 {
-    lv_font_fmt_ft_dsc_t * dsc = lv_mem_alloc(sizeof(lv_font_fmt_ft_dsc_t));
+    size_t need_size = sizeof(lv_font_fmt_ft_dsc_t) + sizeof(lv_font_t);
+    lv_font_fmt_ft_dsc_t * dsc = lv_mem_alloc(need_size);
     if(dsc == NULL) return false;
+    lv_memset_00(dsc, need_size);
 
-    dsc->font = lv_mem_alloc(sizeof(lv_font_t));
-    if(dsc->font == NULL) {
-        lv_mem_free(dsc);
-        return false;
-    }
+    dsc->font = (lv_font_t *)(((char *)dsc) + sizeof(lv_font_fmt_ft_dsc_t));
+    dsc->mem = info->mem;
+    dsc->mem_size = info->mem_size;
+    dsc->name = name_refer_save(info->name);
+    dsc->height = info->weight;
+    dsc->style = info->style;
 
-    lv_face_info_t * face_info = NULL;
     FT_Face face = face_find_in_list(info);
     if(face == NULL) {
-        face_info = lv_mem_alloc(sizeof(lv_face_info_t) + strlen(info->name) + 1);
-        if(face_info == NULL) {
-            goto Fail;
+        FT_Error error;
+        if(dsc->mem) {
+            error = FT_New_Memory_Face(library, dsc->mem, (FT_Long) dsc->mem_size, 0, &face);
+        }
+        else {
+            error = FT_New_Face(library, dsc->name, 0, &face);
         }
-        FT_Error error = FT_New_Face(library, info->name, 0, &face);
         if(error) {
-            lv_mem_free(face_info);
             LV_LOG_WARN("create face error(%d)", error);
             goto Fail;
         }
 
         /* link face and face info */
-        face_info->name = ((char *)face_info) + sizeof(lv_face_info_t);
-        strcpy(face_info->name, info->name);
-        face->generic.data = face_info;
+        face->generic.data = dsc;
         face->generic.finalizer = face_generic_finalizer;
         face_add_to_list(face);
     }
@@ -440,8 +576,6 @@ static bool lv_ft_font_init_nocache(lv_ft_info_t * info)
 
     FT_Set_Pixel_Sizes(face, 0, info->weight);
     dsc->size = face->size;
-    dsc->height = info->weight;
-    dsc->style = info->style;
 
     lv_font_t * font = dsc->font;
     font->dsc = dsc;
@@ -460,7 +594,6 @@ static bool lv_ft_font_init_nocache(lv_ft_info_t * info)
     return true;
 
 Fail:
-    lv_mem_free(dsc->font);
     lv_mem_free(dsc);
     return false;
 }
@@ -476,11 +609,79 @@ static void lv_ft_font_destroy_nocache(lv_font_t * font)
         FT_Face face = dsc->size->face;
         FT_Done_Size(dsc->size);
         FT_Done_Face(face);
-        lv_mem_free(dsc->font);
+        name_refer_del(dsc->name);
         lv_mem_free(dsc);
     }
 }
 
 #endif/* LV_FREETYPE_CACHE_SIZE */
 
+/**
+ * find name string in names list.name string cnt += 1 if find.
+ * @param name name string
+ * @return the string pointer of name.
+ */
+static const char * name_refer_find(const char * name)
+{
+    name_refer_t * refer = _lv_ll_get_head(&names_ll);
+    while(refer) {
+        if(strcmp(refer->name, name) == 0) {
+            refer->cnt += 1;
+            return refer->name;
+        }
+        refer = _lv_ll_get_next(&names_ll, refer);
+    }
+    return NULL;
+}
+
+/**
+ * del name string from list.
+ */
+static void name_refer_del(const char * name)
+{
+    name_refer_t * refer = _lv_ll_get_head(&names_ll);
+    while(refer) {
+        if(strcmp(refer->name, name) == 0) {
+            refer->cnt -= 1;
+            if(refer->cnt <= 0) {
+                _lv_ll_remove(&names_ll, refer);
+                lv_mem_free((void *)refer->name);
+                lv_mem_free(refer);
+            }
+            return;
+        }
+        refer = _lv_ll_get_next(&names_ll, refer);
+    }
+
+    LV_LOG_WARN("name_in_names_del error(not find:%p).", name);
+}
+
+/**
+ * save name string to list.
+ * @param name name string
+ * @return Saved string pointer
+ */
+static const char * name_refer_save(const char * name)
+{
+    const char * pos = name_refer_find(name);
+    if(pos) {
+        return pos;
+    }
+
+    name_refer_t * refer = _lv_ll_ins_tail(&names_ll);
+    if(refer) {
+        uint32_t len = strlen(name) + 1;
+        refer->name = lv_mem_alloc(len);
+        if(refer->name) {
+            lv_memcpy((void *)refer->name, name, len);
+            refer->cnt = 1;
+            return refer->name;
+        }
+        _lv_ll_remove(&names_ll, refer);
+        lv_mem_free(refer);
+    }
+    LV_LOG_WARN("save_name_to_names error(not memory).");
+    return "";
+}
+
 #endif /*LV_USE_FREETYPE*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.h b/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.h
index 3f1fe7076..247a7fb7f 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/freetype/lv_freetype.h
@@ -30,6 +30,8 @@ typedef enum {
 
 typedef struct {
     const char * name;  /* The name of the font file */
+    const void * mem;   /* The pointer of the font file */
+    size_t mem_size;    /* The size of the memory */
     lv_font_t * font;   /* point to lvgl font */
     uint16_t weight;    /* font size */
     uint16_t style;     /* font style */
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_fatfs.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_fatfs.c
index 157a778ed..73596ece7 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_fatfs.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_fatfs.c
@@ -8,13 +8,17 @@
  *********************/
 #include "../../../lvgl.h"
 
-#if LV_USE_FS_FATFS != '\0'
+#if LV_USE_FS_FATFS
 #include "ff.h"
 
 /*********************
  *      DEFINES
  *********************/
 
+#if LV_FS_FATFS_LETTER == '\0'
+    #error "LV_FS_FATFS_LETTER must be an upper case ASCII letter"
+#endif
+
 /**********************
  *      TYPEDEFS
  **********************/
@@ -54,7 +58,7 @@ void lv_fs_fatfs_init(void)
     fs_init();
 
     /*---------------------------------------------------
-     * Register the file system interface in LittlevGL
+     * Register the file system interface in LVGL
      *--------------------------------------------------*/
 
     /*Add a simple drive to open images*/
@@ -62,7 +66,9 @@ void lv_fs_fatfs_init(void)
     lv_fs_drv_init(&fs_drv);
 
     /*Set up fields...*/
-    fs_drv.letter = LV_USE_FS_FATFS;
+    fs_drv.letter = LV_FS_FATFS_LETTER;
+    fs_drv.cache_size = LV_FS_FATFS_CACHE_SIZE;
+
     fs_drv.open_cb = fs_open;
     fs_drv.close_cb = fs_close;
     fs_drv.read_cb = fs_read;
@@ -110,7 +116,8 @@ static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
     FRESULT res = f_open(f, path, flags);
     if(res == FR_OK) {
         return f;
-    } else {
+    }
+    else {
         lv_mem_free(f);
         return NULL;
     }
@@ -178,18 +185,18 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
 static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs_whence_t whence)
 {
     LV_UNUSED(drv);
-    switch (whence) {
-    case LV_FS_SEEK_SET:
-        f_lseek(file_p, pos);
-        break;
-    case LV_FS_SEEK_CUR:
-        f_lseek(file_p, f_tell(file_p) + pos);
-        break;
-    case LV_FS_SEEK_END:
-        f_lseek(file_p, f_size(file_p) + pos);
-        break;
-    default:
-        break;
+    switch(whence) {
+        case LV_FS_SEEK_SET:
+            f_lseek(file_p, pos);
+            break;
+        case LV_FS_SEEK_CUR:
+            f_lseek(file_p, f_tell((FIL *)file_p) + pos);
+            break;
+        case LV_FS_SEEK_END:
+            f_lseek(file_p, f_size((FIL *)file_p) + pos);
+            break;
+        default:
+            break;
     }
     return LV_FS_RES_OK;
 }
@@ -205,7 +212,7 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs
 static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
 {
     LV_UNUSED(drv);
-    *pos_p = f_tell(file_p);
+    *pos_p = f_tell((FIL *)file_p);
     return LV_FS_RES_OK;
 }
 
@@ -273,4 +280,11 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p)
     return LV_FS_RES_OK;
 }
 
-#endif  /*LV_USE_FS_FATFS*/
+#else /*LV_USE_FS_FATFS == 0*/
+
+#if defined(LV_FS_FATFS_LETTER) && LV_FS_FATFS_LETTER != '\0'
+    #warning "LV_USE_FS_FATFS is not enabled but LV_FS_FATFS_LETTER is set"
+#endif
+
+#endif /*LV_USE_FS_POSIX*/
+
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c
index 85985bcb0..fb5fcd306 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c
@@ -8,21 +8,26 @@
  *      INCLUDES
  *********************/
 #include "../../../lvgl.h"
-#if LV_USE_FS_POSIX != '\0'
+
+#if LV_USE_FS_POSIX
 
 #include <fcntl.h>
 #include <stdio.h>
 #ifndef WIN32
-#include <dirent.h>
-#include <unistd.h>
+    #include <dirent.h>
+    #include <unistd.h>
 #else
-#include <windows.h>
+    #include <windows.h>
 #endif
 
 /*********************
  *      DEFINES
  *********************/
 
+#if LV_FS_POSIX_LETTER == '\0'
+    #error "LV_FS_POSIX_LETTER must be an upper case ASCII letter"
+#endif
+
 /**********************
  *      TYPEDEFS
  **********************/
@@ -58,7 +63,7 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p);
 void lv_fs_posix_init(void)
 {
     /*---------------------------------------------------
-     * Register the file system interface in LittlevGL
+     * Register the file system interface in LVGL
      *--------------------------------------------------*/
 
     /*Add a simple drive to open images*/
@@ -66,7 +71,9 @@ void lv_fs_posix_init(void)
     lv_fs_drv_init(&fs_drv);
 
     /*Set up fields...*/
-    fs_drv.letter = LV_USE_FS_POSIX;
+    fs_drv.letter = LV_FS_POSIX_LETTER;
+    fs_drv.cache_size = LV_FS_POSIX_CACHE_SIZE;
+
     fs_drv.open_cb = fs_open;
     fs_drv.close_cb = fs_close;
     fs_drv.read_cb = fs_read;
@@ -101,15 +108,11 @@ static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
     else if(mode == LV_FS_MODE_RD) flags = O_RDONLY;
     else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) flags = O_RDWR;
 
-#ifdef LV_FS_POSIX_PATH
     /*Make the path relative to the current directory (the projects root folder)*/
     char buf[256];
     sprintf(buf, LV_FS_POSIX_PATH "%s", path);
 
     int f = open(buf, flags);
-#else
-    int f = open(path, flags);
-#endif
     if(f < 0) return NULL;
 
     return (void *)(lv_uintptr_t)f;
@@ -143,7 +146,7 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
 {
     LV_UNUSED(drv);
     *br = read((lv_uintptr_t)file_p, buf, btr);
-    return (int32_t)*br < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
+    return (int32_t)(*br) < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
 }
 
 /**
@@ -159,7 +162,7 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
 {
     LV_UNUSED(drv);
     *bw = write((lv_uintptr_t)file_p, buf, btw);
-    return (int32_t)*bw < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
+    return (int32_t)(*bw) < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
 }
 
 /**
@@ -193,7 +196,7 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
 }
 
 #ifdef WIN32
-static char next_fn[256];
+    static char next_fn[256];
 #endif
 
 /**
@@ -207,35 +210,29 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
     LV_UNUSED(drv);
 
 #ifndef WIN32
-# ifdef LV_FS_POSIX_PATH
     /*Make the path relative to the current directory (the projects root folder)*/
     char buf[256];
     sprintf(buf, LV_FS_POSIX_PATH "%s", path);
     return opendir(buf);
-# else
-    return opendir(path);
-# endif
 #else
     HANDLE d = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATA fdata;
 
     /*Make the path relative to the current directory (the projects root folder)*/
     char buf[256];
-# ifdef LV_FS_POSIX_PATH
     sprintf(buf, LV_FS_POSIX_PATH "%s\\*", path);
-# else
-    sprintf(buf, "%s\\*", path);
-# endif
 
     strcpy(next_fn, "");
     d = FindFirstFile(buf, &fdata);
     do {
-        if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
+        if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
             continue;
-        } else {
-            if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+        }
+        else {
+            if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
                 sprintf(next_fn, "/%s", fdata.cFileName);
-            } else {
+            }
+            else {
                 sprintf(next_fn, "%s", fdata.cFileName);
             }
             break;
@@ -259,13 +256,14 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
     LV_UNUSED(drv);
 
 #ifndef WIN32
-    struct dirent *entry;
+    struct dirent * entry;
     do {
         entry = readdir(dir_p);
         if(entry) {
             if(entry->d_type == DT_DIR) sprintf(fn, "/%s", entry->d_name);
             else strcpy(fn, entry->d_name);
-        } else {
+        }
+        else {
             strcpy(fn, "");
         }
     } while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0);
@@ -277,12 +275,14 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
 
     if(FindNextFile(dir_p, &fdata) == false) return LV_FS_RES_OK;
     do {
-        if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
+        if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
             continue;
-        } else {
-            if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+        }
+        else {
+            if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
                 sprintf(next_fn, "/%s", fdata.cFileName);
-            } else {
+            }
+            else {
                 sprintf(next_fn, "%s", fdata.cFileName);
             }
             break;
@@ -309,5 +309,10 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p)
 #endif
     return LV_FS_RES_OK;
 }
+#else /*LV_USE_FS_POSIX == 0*/
+
+#if defined(LV_FS_POSIX_LETTER) && LV_FS_POSIX_LETTER != '\0'
+    #warning "LV_USE_FS_POSIX is not enabled but LV_FS_POSIX_LETTER is set"
+#endif
 
 #endif /*LV_USE_FS_POSIX*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_stdio.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_stdio.c
index 193741b20..e4bf07783 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_stdio.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_stdio.c
@@ -12,10 +12,10 @@
 
 #include <stdio.h>
 #ifndef WIN32
-#include <dirent.h>
-#include <unistd.h>
+    #include <dirent.h>
+    #include <unistd.h>
 #else
-#include <windows.h>
+    #include <windows.h>
 #endif
 
 /*********************
@@ -57,7 +57,7 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p);
 void lv_fs_stdio_init(void)
 {
     /*---------------------------------------------------
-     * Register the file system interface in LittlevGL
+     * Register the file system interface in LVGL
      *--------------------------------------------------*/
 
     /*Add a simple drive to open images*/
@@ -65,7 +65,9 @@ void lv_fs_stdio_init(void)
     lv_fs_drv_init(&fs_drv);
 
     /*Set up fields...*/
-    fs_drv.letter = LV_USE_FS_STDIO;
+    fs_drv.letter = LV_FS_STDIO_LETTER;
+    fs_drv.cache_size = LV_FS_STDIO_CACHE_SIZE;
+
     fs_drv.open_cb = fs_open;
     fs_drv.close_cb = fs_close;
     fs_drv.read_cb = fs_read;
@@ -101,16 +103,12 @@ static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
     else if(mode == LV_FS_MODE_RD) flags = "rb";
     else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) flags = "rb+";
 
-#ifdef LV_FS_STDIO_PATH
     /*Make the path relative to the current directory (the projects root folder)*/
 
     char buf[256];
     sprintf(buf, LV_FS_STDIO_PATH "%s", path);
 
     return fopen(buf, flags);
-#else
-    return fopen(path, flags);
-#endif
 }
 
 /**
@@ -141,7 +139,7 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
 {
     LV_UNUSED(drv);
     *br = fread(buf, 1, btr, file_p);
-    return (int32_t)*br < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
+    return (int32_t)(*br) < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
 }
 
 /**
@@ -157,7 +155,7 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
 {
     LV_UNUSED(drv);
     *bw = fwrite(buf, 1, btw, file_p);
-    return (int32_t)*bw < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
+    return (int32_t)(*bw) < 0 ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
 }
 
 /**
@@ -191,7 +189,7 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
 }
 
 #ifdef WIN32
-static char next_fn[256];
+    static char next_fn[256];
 #endif
 
 /**
@@ -204,35 +202,29 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
 {
     LV_UNUSED(drv);
 #ifndef WIN32
-# ifdef LV_FS_STDIO_PATH
     /*Make the path relative to the current directory (the projects root folder)*/
     char buf[256];
     sprintf(buf, LV_FS_STDIO_PATH "%s", path);
     return opendir(buf);
-# else
-    return opendir(path);
-# endif
 #else
     HANDLE d = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATA fdata;
 
     /*Make the path relative to the current directory (the projects root folder)*/
     char buf[256];
-# ifdef LV_FS_STDIO_PATH
     sprintf(buf, LV_FS_STDIO_PATH "%s\\*", path);
-# else
-    sprintf(buf, "%s\\*", path);
-# endif
 
     strcpy(next_fn, "");
     d = FindFirstFile(buf, &fdata);
     do {
-        if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
+        if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
             continue;
-        } else {
-            if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+        }
+        else {
+            if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
                 sprintf(next_fn, "/%s", fdata.cFileName);
-            } else {
+            }
+            else {
                 sprintf(next_fn, "%s", fdata.cFileName);
             }
             break;
@@ -256,13 +248,14 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
     LV_UNUSED(drv);
 
 #ifndef WIN32
-    struct dirent *entry;
+    struct dirent * entry;
     do {
         entry = readdir(dir_p);
         if(entry) {
             if(entry->d_type == DT_DIR) sprintf(fn, "/%s", entry->d_name);
             else strcpy(fn, entry->d_name);
-        } else {
+        }
+        else {
             strcpy(fn, "");
         }
     } while(strcmp(fn, "/.") == 0 || strcmp(fn, "/..") == 0);
@@ -274,12 +267,14 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
 
     if(FindNextFile(dir_p, &fdata) == false) return LV_FS_RES_OK;
     do {
-        if (strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
+        if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) {
             continue;
-        } else {
-            if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+        }
+        else {
+            if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
                 sprintf(next_fn, "/%s", fdata.cFileName);
-            } else {
+            }
+            else {
                 sprintf(next_fn, "%s", fdata.cFileName);
             }
             break;
@@ -307,4 +302,11 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p)
     return LV_FS_RES_OK;
 }
 
-#endif /*LV_USE_FS_STDIO*/
+#else /*LV_USE_FS_STDIO == 0*/
+
+#if defined(LV_FS_STDIO_LETTER) && LV_FS_STDIO_LETTER != '\0'
+    #warning "LV_USE_FS_STDIO is not enabled but LV_FS_STDIO_LETTER is set"
+#endif
+
+#endif /*LV_USE_FS_POSIX*/
+
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_win32.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_win32.c
index 72ef22a70..ad4536d40 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_win32.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fs_win32.c
@@ -11,6 +11,7 @@
 #if LV_USE_FS_WIN32 != '\0'
 
 #include <windows.h>
+#include <stdio.h>
 
 /*********************
  *      DEFINES
@@ -54,7 +55,7 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p);
 void lv_fs_win32_init(void)
 {
     /*---------------------------------------------------
-     * Register the file system interface in LittlevGL
+     * Register the file system interface in LVGL
      *--------------------------------------------------*/
 
     /*Add a simple drive to open images*/
@@ -62,7 +63,9 @@ void lv_fs_win32_init(void)
     lv_fs_drv_init(&fs_drv);
 
     /*Set up fields...*/
-    fs_drv.letter = LV_USE_FS_WIN32;
+    fs_drv.letter = LV_FS_WIN32_LETTER;
+    fs_drv.cache_size = LV_FS_WIN32_CACHE_SIZE;
+
     fs_drv.open_cb = fs_open;
     fs_drv.close_cb = fs_close;
     fs_drv.read_cb = fs_read;
@@ -101,7 +104,7 @@ static lv_fs_res_t fs_error_from_win32(DWORD error)
 {
     lv_fs_res_t res;
 
-    switch (error) {
+    switch(error) {
         case ERROR_SUCCESS:
             res = LV_FS_RES_OK;
             break;
@@ -199,33 +202,27 @@ static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
 
     DWORD desired_access = 0;
 
-    if (mode & LV_FS_MODE_RD) {
+    if(mode & LV_FS_MODE_RD) {
         desired_access |= GENERIC_READ;
     }
 
-    if (mode & LV_FS_MODE_WR) {
+    if(mode & LV_FS_MODE_WR) {
         desired_access |= GENERIC_WRITE;
     }
 
-#ifdef LV_FS_WIN32_PATH
     /*Make the path relative to the current directory (the projects root folder)*/
 
     char buf[MAX_PATH];
     sprintf(buf, LV_FS_WIN32_PATH "%s", path);
-#endif
 
-    return (void*)CreateFileA(
-#ifdef LV_FS_WIN32_PATH
-        buf,
-#else
-        path,
-#endif
-        desired_access,
-        FILE_SHARE_READ,
-        NULL,
-        OPEN_EXISTING,
-        FILE_ATTRIBUTE_NORMAL,
-        NULL);
+    return (void *)CreateFileA(
+               buf,
+               desired_access,
+               FILE_SHARE_READ,
+               NULL,
+               OPEN_EXISTING,
+               FILE_ATTRIBUTE_NORMAL,
+               NULL);
 }
 
 /**
@@ -239,8 +236,8 @@ static lv_fs_res_t fs_close(lv_fs_drv_t * drv, void * file_p)
 {
     LV_UNUSED(drv);
     return CloseHandle((HANDLE)file_p)
-        ? LV_FS_RES_OK
-        : fs_error_from_win32(GetLastError());
+           ? LV_FS_RES_OK
+           : fs_error_from_win32(GetLastError());
 }
 
 /**
@@ -257,8 +254,8 @@ static lv_fs_res_t fs_read(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_
 {
     LV_UNUSED(drv);
     return ReadFile((HANDLE)file_p, buf, btr, (LPDWORD)br, NULL)
-        ? LV_FS_RES_OK
-        : fs_error_from_win32(GetLastError());
+           ? LV_FS_RES_OK
+           : fs_error_from_win32(GetLastError());
 }
 
 /**
@@ -274,8 +271,8 @@ static lv_fs_res_t fs_write(lv_fs_drv_t * drv, void * file_p, const void * buf,
 {
     LV_UNUSED(drv);
     return WriteFile((HANDLE)file_p, buf, btw, (LPDWORD)bw, NULL)
-        ? LV_FS_RES_OK
-        : fs_error_from_win32(GetLastError());
+           ? LV_FS_RES_OK
+           : fs_error_from_win32(GetLastError());
 }
 
 /**
@@ -290,8 +287,8 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs
 {
     LV_UNUSED(drv);
 
-    DWORD move_method = (DWORD)-1;
-    if (whence == LV_FS_SEEK_SET) {
+    DWORD move_method = (DWORD) -1;
+    if(whence == LV_FS_SEEK_SET) {
         move_method = FILE_BEGIN;
     }
     else if(whence == LV_FS_SEEK_CUR) {
@@ -304,8 +301,8 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs
     LARGE_INTEGER distance_to_move;
     distance_to_move.QuadPart = pos;
     return SetFilePointerEx((HANDLE)file_p, distance_to_move, NULL, move_method)
-        ? LV_FS_RES_OK
-        : fs_error_from_win32(GetLastError());
+           ? LV_FS_RES_OK
+           : fs_error_from_win32(GetLastError());
 }
 
 /**
@@ -320,7 +317,7 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
 {
     LV_UNUSED(drv);
 
-    if (!pos_p) {
+    if(!pos_p) {
         return LV_FS_RES_INV_PARAM;
     }
 
@@ -329,12 +326,12 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
 
     LARGE_INTEGER distance_to_move;
     distance_to_move.QuadPart = 0;
-    if (SetFilePointerEx(
-        (HANDLE)file_p,
-        distance_to_move,
-        &file_pointer,
-        FILE_CURRENT)) {
-        if (file_pointer.QuadPart > LONG_MAX) {
+    if(SetFilePointerEx(
+           (HANDLE)file_p,
+           distance_to_move,
+           &file_pointer,
+           FILE_CURRENT)) {
+        if(file_pointer.QuadPart > LONG_MAX) {
             return LV_FS_RES_INV_PARAM;
         }
         else {
@@ -374,11 +371,11 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
     strcpy(next_fn, "");
     d = FindFirstFileA(buf, &fdata);
     do {
-        if (is_dots_name(fdata.cFileName)) {
+        if(is_dots_name(fdata.cFileName)) {
             continue;
         }
         else {
-            if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+            if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
                 sprintf(next_fn, "/%s", fdata.cFileName);
             }
             else {
@@ -387,7 +384,7 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
             break;
         }
 
-    } while (FindNextFileA(d, &fdata));
+    } while(FindNextFileA(d, &fdata));
 
     next_error = fs_error_from_win32(GetLastError());
     return d;
@@ -412,12 +409,12 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
     strcpy(next_fn, "");
     WIN32_FIND_DATAA fdata;
 
-    while (FindNextFileA(dir_p, &fdata)) {
-        if (is_dots_name(fdata.cFileName)) {
+    while(FindNextFileA(dir_p, &fdata)) {
+        if(is_dots_name(fdata.cFileName)) {
             continue;
         }
         else {
-            if (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+            if(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
                 sprintf(next_fn, "/%s", fdata.cFileName);
             }
             else {
@@ -427,7 +424,7 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
         }
     }
 
-    if (next_fn[0] == '\0') {
+    if(next_fn[0] == '\0') {
         next_error = fs_error_from_win32(GetLastError());
     }
 
@@ -444,8 +441,14 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p)
 {
     LV_UNUSED(drv);
     return FindClose((HANDLE)dir_p)
-        ? LV_FS_RES_OK
-        : fs_error_from_win32(GetLastError());
+           ? LV_FS_RES_OK
+           : fs_error_from_win32(GetLastError());
 }
 
-#endif /*LV_USE_FS_WIN32*/
+#else /*LV_USE_FS_WIN32 == 0*/
+
+#if defined(LV_FS_WIN32_LETTER) && LV_FS_WIN32_LETTER != '\0'
+    #warning "LV_USE_FS_WIN32 is not enabled but LV_FS_WIN32_LETTER is set"
+#endif
+
+#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fsdrv.h b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fsdrv.h
index c7ca8df1b..285d598fd 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fsdrv.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/fsdrv/lv_fsdrv.h
@@ -28,19 +28,19 @@ extern "C" {
  **********************/
 
 #if LV_USE_FS_FATFS != '\0'
-	void lv_fs_fatfs_init(void);
+void lv_fs_fatfs_init(void);
 #endif
 
 #if LV_USE_FS_STDIO != '\0'
-	void lv_fs_stdio_init(void);
+void lv_fs_stdio_init(void);
 #endif
 
 #if LV_USE_FS_POSIX != '\0'
-	void lv_fs_posix_init(void);
+void lv_fs_posix_init(void);
 #endif
 
 #if LV_USE_FS_WIN32 != '\0'
-	void lv_fs_win32_init(void);
+void lv_fs_win32_init(void);
 #endif
 
 /**********************
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/lv_libs.h b/lib/libesp32_lvgl/lvgl/src/extra/libs/lv_libs.h
index eb2d03532..e795f4c76 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/lv_libs.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/lv_libs.h
@@ -13,15 +13,15 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-// TODO Tasmota
 // #include "bmp/lv_bmp.h"
 // #include "fsdrv/lv_fsdrv.h"
 #include "png/lv_png.h"
 // #include "gif/lv_gif.h"
-// #include "qrcode/lv_qrcode.h"
+#include "qrcode/lv_qrcode.h"
 // #include "sjpg/lv_sjpg.h"
 #include "freetype/lv_freetype.h"
 // #include "rlottie/lv_rlottie.h"
+// #include "ffmpeg/lv_ffmpeg.h"
 
 /*********************
  *      DEFINES
@@ -43,4 +43,4 @@ extern "C" {
 } /*extern "C"*/
 #endif
 
-#endif /*LV_LAYOUTS_H*/
+#endif /*LV_LIBS_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.c
index 5eb2ff71c..0b88eb89a 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.c
@@ -42,7 +42,7 @@ static void convert_color_depth(uint8_t * img, uint32_t px_cnt);
  **********************/
 
 /**
- * Register the PNG decoder functions in LittlevGL
+ * Register the PNG decoder functions in LVGL
  */
 void lv_png_init(void)
 {
@@ -65,47 +65,49 @@ void lv_png_init(void)
 static lv_res_t decoder_info(struct _lv_img_decoder_t * decoder, const void * src, lv_img_header_t * header)
 {
     (void) decoder; /*Unused*/
-     lv_img_src_t src_type = lv_img_src_get_type(src);          /*Get the source type*/
+    lv_img_src_t src_type = lv_img_src_get_type(src);          /*Get the source type*/
 
-     /*If it's a PNG file...*/
-     if(src_type == LV_IMG_SRC_FILE) {
-         const char * fn = src;
-         if(!strcmp(&fn[strlen(fn) - 3], "png")) {              /*Check the extension*/
+    /*If it's a PNG file...*/
+    if(src_type == LV_IMG_SRC_FILE) {
+        const char * fn = src;
+        if(!strcmp(&fn[strlen(fn) - 3], "png")) {              /*Check the extension*/
 
-             /* Read the width and height from the file. They have a constant location:
-              * [16..23]: width
-              * [24..27]: height
-              */
-             uint32_t size[2];
-             lv_fs_file_t f;
-             lv_fs_res_t res = lv_fs_open(&f, fn, LV_FS_MODE_RD);
-             if(res != LV_FS_RES_OK) return LV_RES_INV;
-             lv_fs_seek(&f, 16, LV_FS_SEEK_SET);
-             uint32_t rn;
-             lv_fs_read(&f, &size, 8, &rn);
-             if(rn != 8) return LV_RES_INV;
-             lv_fs_close(&f);
-             /*Save the data in the header*/
-             header->always_zero = 0;
-             header->cf = LV_IMG_CF_RAW_ALPHA;
-             /*The width and height are stored in Big endian format so convert them to little endian*/
-             header->w = (lv_coord_t) ((size[0] & 0xff000000) >> 24) +  ((size[0] & 0x00ff0000) >> 8);
-             header->h = (lv_coord_t) ((size[1] & 0xff000000) >> 24) +  ((size[1] & 0x00ff0000) >> 8);
+            /* Read the width and height from the file. They have a constant location:
+             * [16..23]: width
+             * [24..27]: height
+             */
+            uint32_t size[2];
+            lv_fs_file_t f;
+            lv_fs_res_t res = lv_fs_open(&f, fn, LV_FS_MODE_RD);
+            if(res != LV_FS_RES_OK) return LV_RES_INV;
+            lv_fs_seek(&f, 16, LV_FS_SEEK_SET);
+            uint32_t rn;
+            lv_fs_read(&f, &size, 8, &rn);
+            if(rn != 8) return LV_RES_INV;
+            lv_fs_close(&f);
+            /*Save the data in the header*/
+            header->always_zero = 0;
+            header->cf = LV_IMG_CF_RAW_ALPHA;
+            /*The width and height are stored in Big endian format so convert them to little endian*/
+            header->w = (lv_coord_t)((size[0] & 0xff000000) >> 24) + ((size[0] & 0x00ff0000) >> 8);
+            header->h = (lv_coord_t)((size[1] & 0xff000000) >> 24) + ((size[1] & 0x00ff0000) >> 8);
 
-             return LV_RES_OK;
-         }
-     }
-     /*If it's a PNG file in a  C array...*/
-     else if(src_type == LV_IMG_SRC_VARIABLE) {
-         const lv_img_dsc_t * img_dsc = src;
-         header->always_zero = 0;
-         header->cf = img_dsc->header.cf;       /*Save the color format*/
-         header->w = img_dsc->header.w;         /*Save the color width*/
-         header->h = img_dsc->header.h;         /*Save the color height*/
-         return LV_RES_OK;
-     }
+            return LV_RES_OK;
+        }
+    }
+    /*If it's a PNG file in a  C array...*/
+    else if(src_type == LV_IMG_SRC_VARIABLE) {
+        const lv_img_dsc_t * img_dsc = src;
+        const uint8_t magic[] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a};
+        if(memcmp(magic, img_dsc->data, sizeof(magic))) return LV_RES_INV;
+        header->always_zero = 0;
+        header->cf = img_dsc->header.cf;       /*Save the color format*/
+        header->w = img_dsc->header.w;         /*Save the color width*/
+        header->h = img_dsc->header.h;         /*Save the color height*/
+        return LV_RES_OK;
+    }
 
-     return LV_RES_INV;         /*If didn't succeeded earlier then it's an error*/
+    return LV_RES_INV;         /*If didn't succeeded earlier then it's an error*/
 }
 
 
@@ -183,10 +185,10 @@ static lv_res_t decoder_open(lv_img_decoder_t * decoder, lv_img_decoder_dsc_t *
 /**
  * Free the allocated resources
  */
-static void decoder_close(lv_img_decoder_t *decoder, lv_img_decoder_dsc_t *dsc)
+static void decoder_close(lv_img_decoder_t * decoder, lv_img_decoder_dsc_t * dsc)
 {
     LV_UNUSED(decoder); /*Unused*/
-    if (dsc->img_data) {
+    if(dsc->img_data) {
         lv_mem_free((uint8_t *)dsc->img_data);
         dsc->img_data = NULL;
     }
@@ -200,7 +202,7 @@ static void decoder_close(lv_img_decoder_t *decoder, lv_img_decoder_dsc_t *dsc)
 static void convert_color_depth(uint8_t * img, uint32_t px_cnt)
 {
 #if LV_COLOR_DEPTH == 32
-    lv_color32_t * img_argb = (lv_color32_t*)img;
+    lv_color32_t * img_argb = (lv_color32_t *)img;
     lv_color_t c;
     lv_color_t * img_c = (lv_color_t *) img;
     uint32_t i;
@@ -210,32 +212,32 @@ static void convert_color_depth(uint8_t * img, uint32_t px_cnt)
         img_c[i].ch.blue = c.ch.red;
     }
 #elif LV_COLOR_DEPTH == 16
-    lv_color32_t * img_argb = (lv_color32_t*)img;
+    lv_color32_t * img_argb = (lv_color32_t *)img;
     lv_color_t c;
     uint32_t i;
     for(i = 0; i < px_cnt; i++) {
         c = lv_color_make(img_argb[i].ch.blue, img_argb[i].ch.green, img_argb[i].ch.red);
-        img[i*3 + 2] = img_argb[i].ch.alpha;
-        img[i*3 + 1] = c.full >> 8;
-        img[i*3 + 0] = c.full & 0xFF;
+        img[i * 3 + 2] = img_argb[i].ch.alpha;
+        img[i * 3 + 1] = c.full >> 8;
+        img[i * 3 + 0] = c.full & 0xFF;
     }
 #elif LV_COLOR_DEPTH == 8
-    lv_color32_t * img_argb = (lv_color32_t*)img;
+    lv_color32_t * img_argb = (lv_color32_t *)img;
     lv_color_t c;
     uint32_t i;
     for(i = 0; i < px_cnt; i++) {
         c = lv_color_make(img_argb[i].ch.red, img_argb[i].ch.green, img_argb[i].ch.blue);
-        img[i*2 + 1] = img_argb[i].ch.alpha;
-        img[i*2 + 0] = c.full;
+        img[i * 2 + 1] = img_argb[i].ch.alpha;
+        img[i * 2 + 0] = c.full;
     }
 #elif LV_COLOR_DEPTH == 1
-    lv_color32_t * img_argb = (lv_color32_t*)img;
+    lv_color32_t * img_argb = (lv_color32_t *)img;
     uint8_t b;
     uint32_t i;
     for(i = 0; i < px_cnt; i++) {
         b = img_argb[i].ch.red | img_argb[i].ch.green | img_argb[i].ch.blue;
-        img[i*2 + 1] = img_argb[i].ch.alpha;
-        img[i*2 + 0] = b > 128 ? 1 : 0;
+        img[i * 2 + 1] = img_argb[i].ch.alpha;
+        img[i * 2 + 0] = b > 128 ? 1 : 0;
     }
 #endif
 }
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.h b/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.h
index 1e9b02d65..438047238 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/png/lv_png.h
@@ -29,7 +29,7 @@ extern "C" {
  **********************/
 
 /**
- * Register the PNG decoder functions in LittlevGL
+ * Register the PNG decoder functions in LVGL
  */
 void lv_png_init(void);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/lv_qrcode.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/lv_qrcode.c
new file mode 100644
index 000000000..079873e13
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/lv_qrcode.c
@@ -0,0 +1,215 @@
+/**
+ * @file lv_qrcode.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_qrcode.h"
+#if LV_USE_QRCODE
+
+#include "qrcodegen.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define MY_CLASS &lv_qrcode_class
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static void lv_qrcode_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void lv_qrcode_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+const lv_obj_class_t lv_qrcode_class = {
+    .constructor_cb = lv_qrcode_constructor,
+    .destructor_cb = lv_qrcode_destructor,
+    .base_class = &lv_canvas_class
+};
+
+static lv_coord_t size_param;
+static lv_color_t dark_color_param;
+static lv_color_t light_color_param;
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Create an empty QR code (an `lv_canvas`) object.
+ * @param parent point to an object where to create the QR code
+ * @param size width and height of the QR code
+ * @param dark_color dark color of the QR code
+ * @param light_color light color of the QR code
+ * @return pointer to the created QR code object
+ */
+lv_obj_t * lv_qrcode_create(lv_obj_t * parent, lv_coord_t size, lv_color_t dark_color, lv_color_t light_color)
+{
+    LV_LOG_INFO("begin");
+    size_param = size;
+    light_color_param = light_color;
+    dark_color_param = dark_color;
+
+    lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent);
+    lv_obj_class_init_obj(obj);
+    return obj;
+
+}
+
+/**
+ * Set the data of a QR code object
+ * @param qrcode pointer to aQ code object
+ * @param data data to display
+ * @param data_len length of data in bytes
+ * @return LV_RES_OK: if no error; LV_RES_INV: on error
+ */
+lv_res_t lv_qrcode_update(lv_obj_t * qrcode, const void * data, uint32_t data_len)
+{
+    lv_color_t c;
+    c.full = 1;
+    lv_canvas_fill_bg(qrcode, c, LV_OPA_COVER);
+
+    if(data_len > qrcodegen_BUFFER_LEN_MAX) return LV_RES_INV;
+
+    lv_img_dsc_t * imgdsc = lv_canvas_get_img(qrcode);
+
+    int32_t qr_version = qrcodegen_getMinFitVersion(qrcodegen_Ecc_MEDIUM, data_len);
+    if(qr_version <= 0) return LV_RES_INV;
+    int32_t qr_size = qrcodegen_version2size(qr_version);
+    if(qr_size <= 0) return LV_RES_INV;
+    int32_t scale = imgdsc->header.w / qr_size;
+    if(scale <= 0) return LV_RES_INV;
+    int32_t remain = imgdsc->header.w % qr_size;
+
+    /* The qr version is incremented by four point */
+    uint32_t version_extend = remain / (scale << 2);
+    if(version_extend && qr_version < qrcodegen_VERSION_MAX) {
+        qr_version = qr_version + version_extend > qrcodegen_VERSION_MAX ?
+                     qrcodegen_VERSION_MAX : qr_version + version_extend;
+    }
+
+    uint8_t * qr0 = lv_mem_alloc(qrcodegen_BUFFER_LEN_FOR_VERSION(qr_version));
+    LV_ASSERT_MALLOC(qr0);
+    uint8_t * data_tmp = lv_mem_alloc(qrcodegen_BUFFER_LEN_FOR_VERSION(qr_version));
+    LV_ASSERT_MALLOC(data_tmp);
+    lv_memcpy(data_tmp, data, data_len);
+
+    bool ok = qrcodegen_encodeBinary(data_tmp, data_len,
+                                     qr0, qrcodegen_Ecc_MEDIUM,
+                                     qr_version, qr_version,
+                                     qrcodegen_Mask_AUTO, true);
+
+    if(!ok) {
+        lv_mem_free(qr0);
+        lv_mem_free(data_tmp);
+        return LV_RES_INV;
+    }
+
+    lv_coord_t obj_w = imgdsc->header.w;
+    qr_size = qrcodegen_getSize(qr0);
+    scale = obj_w / qr_size;
+    int scaled = qr_size * scale;
+    int margin = (obj_w - scaled) / 2;
+    uint8_t * buf_u8 = (uint8_t *)imgdsc->data + 8;    /*+8 skip the palette*/
+
+    /* Copy the qr code canvas:
+     * A simple `lv_canvas_set_px` would work but it's slow for so many pixels.
+     * So buffer 1 byte (8 px) from the qr code and set it in the canvas image */
+    uint32_t row_byte_cnt = (imgdsc->header.w + 7) >> 3;
+    int y;
+    for(y = margin; y < scaled + margin; y += scale) {
+        uint8_t b = 0;
+        uint8_t p = 0;
+        bool aligned = false;
+        int x;
+        for(x = margin; x < scaled + margin; x++) {
+            bool a = qrcodegen_getModule(qr0, (x - margin) / scale, (y - margin) / scale);
+
+            if(aligned == false && (x & 0x7) == 0) aligned = true;
+
+            if(aligned == false) {
+                c.full = a ? 0 : 1;
+                lv_canvas_set_px_color(qrcode, x, y, c);
+            }
+            else {
+                if(!a) b |= (1 << (7 - p));
+                p++;
+                if(p == 8) {
+                    uint32_t px = row_byte_cnt * y + (x >> 3);
+                    buf_u8[px] = b;
+                    b = 0;
+                    p = 0;
+                }
+            }
+        }
+
+        /*Process the last byte of the row*/
+        if(p) {
+            /*Make the rest of the bits white*/
+            b |= (1 << (8 - p)) - 1;
+
+            uint32_t px = row_byte_cnt * y + (x >> 3);
+            buf_u8[px] = b;
+        }
+
+        /*The Qr is probably scaled so simply to the repeated rows*/
+        int s;
+        const uint8_t * row_ori = buf_u8 + row_byte_cnt * y;
+        for(s = 1; s < scale; s++) {
+            lv_memcpy((uint8_t *)buf_u8 + row_byte_cnt * (y + s), row_ori, row_byte_cnt);
+        }
+    }
+
+    lv_mem_free(qr0);
+    lv_mem_free(data_tmp);
+    return LV_RES_OK;
+}
+
+
+void lv_qrcode_delete(lv_obj_t * qrcode)
+{
+    lv_obj_del(qrcode);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void lv_qrcode_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+
+    uint32_t buf_size = LV_CANVAS_BUF_SIZE_INDEXED_1BIT(size_param, size_param);
+    uint8_t * buf = lv_mem_alloc(buf_size);
+    LV_ASSERT_MALLOC(buf);
+    if(buf == NULL) return;
+
+    lv_canvas_set_buffer(obj, buf, size_param, size_param, LV_IMG_CF_INDEXED_1BIT);
+    lv_canvas_set_palette(obj, 0, dark_color_param);
+    lv_canvas_set_palette(obj, 1, light_color_param);
+}
+
+static void lv_qrcode_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+
+    lv_img_dsc_t * img = lv_canvas_get_img(obj);
+    lv_img_cache_invalidate_src(img);
+    lv_mem_free((void *)img->data);
+    img->data = NULL;
+}
+
+#endif /*LV_USE_QRCODE*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/lv_qrcode.h b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/lv_qrcode.h
new file mode 100644
index 000000000..b0752ace9
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/lv_qrcode.h
@@ -0,0 +1,69 @@
+/**
+ * @file lv_qrcode
+ *
+ */
+
+#ifndef LV_QRCODE_H
+#define LV_QRCODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../../lvgl.h"
+#if LV_USE_QRCODE
+
+/*********************
+ *      DEFINES
+ *********************/
+
+extern const lv_obj_class_t lv_qrcode_class;
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Create an empty QR code (an `lv_canvas`) object.
+ * @param parent point to an object where to create the QR code
+ * @param size width and height of the QR code
+ * @param dark_color dark color of the QR code
+ * @param light_color light color of the QR code
+ * @return pointer to the created QR code object
+ */
+lv_obj_t * lv_qrcode_create(lv_obj_t * parent, lv_coord_t size, lv_color_t dark_color, lv_color_t light_color);
+
+/**
+ * Set the data of a QR code object
+ * @param qrcode pointer to aQ code object
+ * @param data data to display
+ * @param data_len length of data in bytes
+ * @return LV_RES_OK: if no error; LV_RES_INV: on error
+ */
+lv_res_t lv_qrcode_update(lv_obj_t * qrcode, const void * data, uint32_t data_len);
+
+/**
+ * DEPRECATED: Use normal lv_obj_del instead
+ * Delete a QR code object
+ * @param qrcode pointer to a QR code object
+ */
+void lv_qrcode_delete(lv_obj_t * qrcode);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*LV_USE_QRCODE*/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_QRCODE_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/qrcodegen.c b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/qrcodegen.c
new file mode 100644
index 000000000..4b06c78e7
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/qrcodegen.c
@@ -0,0 +1,1035 @@
+/* 
+ * QR Code generator library (C)
+ * 
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include "qrcodegen.h"
+
+#ifndef QRCODEGEN_TEST
+	#define testable static  // Keep functions private
+#else
+	#define testable  // Expose private functions
+#endif
+
+
+/*---- Forward declarations for private functions ----*/
+
+// Regarding all public and private functions defined in this source file:
+// - They require all pointer/array arguments to be not null unless the array length is zero.
+// - They only read input scalar/array arguments, write to output pointer/array
+//   arguments, and return scalar values; they are "pure" functions.
+// - They don't read mutable global variables or write to any global variables.
+// - They don't perform I/O, read the clock, print to console, etc.
+// - They allocate a small and constant amount of stack memory.
+// - They don't allocate or free any memory on the heap.
+// - They don't recurse or mutually recurse. All the code
+//   could be inlined into the top-level public functions.
+// - They run in at most quadratic time with respect to input arguments.
+//   Most functions run in linear time, and some in constant time.
+//   There are no unbounded loops or non-obvious termination conditions.
+// - They are completely thread-safe if the caller does not give the
+//   same writable buffer to concurrent calls to these functions.
+
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen);
+
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]);
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl);
+testable int getNumRawDataModules(int ver);
+
+testable void calcReedSolomonGenerator(int degree, uint8_t result[]);
+testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
+	const uint8_t generator[], int degree, uint8_t result[]);
+testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y);
+
+testable void initializeFunctionModules(int version, uint8_t qrcode[]);
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version);
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]);
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]);
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]);
+
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]);
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask);
+static long getPenaltyScore(const uint8_t qrcode[]);
+static void addRunToHistory(unsigned char run, unsigned char history[7]);
+static bool hasFinderLikePattern(const unsigned char runHistory[7]);
+
+testable bool getModule(const uint8_t qrcode[], int x, int y);
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack);
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack);
+static bool getBit(int x, int i);
+
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars);
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version);
+static int numCharCountBits(enum qrcodegen_Mode mode, int version);
+
+
+
+/*---- Private tables of constants ----*/
+
+// The set of all legal characters in alphanumeric mode, where each character
+// value maps to the index in the string. For checking text and encoding segments.
+static const char *ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:";
+
+// For generating error correction codes.
+testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = {
+	// Version: (note that index 0 is for padding, and is set to an illegal value)
+	//0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+	{-1,  7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Low
+	{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28},  // Medium
+	{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Quartile
+	{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // High
+};
+
+#define qrcodegen_REED_SOLOMON_DEGREE_MAX 30  // Based on the table above
+
+// For generating error correction codes.
+testable const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41] = {
+	// Version: (note that index 0 is for padding, and is set to an illegal value)
+	//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+	{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4,  4,  4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},  // Low
+	{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5,  5,  8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},  // Medium
+	{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8,  8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},  // Quartile
+	{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},  // High
+};
+
+// For automatic mask pattern selection.
+static const int PENALTY_N1 =  3;
+static const int PENALTY_N2 =  3;
+static const int PENALTY_N3 = 40;
+static const int PENALTY_N4 = 10;
+
+
+
+/*---- High-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+		enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
+	
+	size_t textLen = strlen(text);
+	if (textLen == 0)
+		return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
+	size_t bufLen = qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion);
+	
+	struct qrcodegen_Segment seg;
+	if (qrcodegen_isNumeric(text)) {
+		if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_NUMERIC, textLen) > bufLen)
+			goto fail;
+		seg = qrcodegen_makeNumeric(text, tempBuffer);
+	} else if (qrcodegen_isAlphanumeric(text)) {
+		if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_ALPHANUMERIC, textLen) > bufLen)
+			goto fail;
+		seg = qrcodegen_makeAlphanumeric(text, tempBuffer);
+	} else {
+		if (textLen > bufLen)
+			goto fail;
+		for (size_t i = 0; i < textLen; i++)
+			tempBuffer[i] = (uint8_t)text[i];
+		seg.mode = qrcodegen_Mode_BYTE;
+		seg.bitLength = calcSegmentBitLength(seg.mode, textLen);
+		if (seg.bitLength == -1)
+			goto fail;
+		seg.numChars = (int)textLen;
+		seg.data = tempBuffer;
+	}
+	return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
+	
+fail:
+	qrcode[0] = 0;  // Set size to invalid value for safety
+	return false;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+		enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
+	
+	struct qrcodegen_Segment seg;
+	seg.mode = qrcodegen_Mode_BYTE;
+	seg.bitLength = calcSegmentBitLength(seg.mode, dataLen);
+	if (seg.bitLength == -1) {
+		qrcode[0] = 0;  // Set size to invalid value for safety
+		return false;
+	}
+	seg.numChars = (int)dataLen;
+	seg.data = dataAndTemp;
+	return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, dataAndTemp, qrcode);
+}
+
+
+// Appends the given number of low-order bits of the given value to the given byte-based
+// bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits.
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) {
+	assert(0 <= numBits && numBits <= 16 && (unsigned long)val >> numBits == 0);
+	for (int i = numBits - 1; i >= 0; i--, (*bitLen)++)
+		buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7));
+}
+
+
+
+/*---- Low-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+		enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+	return qrcodegen_encodeSegmentsAdvanced(segs, len, ecl,
+		qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX, -1, true, tempBuffer, qrcode);
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+		int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+	assert(segs != NULL || len == 0);
+	assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= qrcodegen_VERSION_MAX);
+	assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7);
+	
+	// Find the minimal version number to use
+	int version, dataUsedBits;
+	for (version = minVersion; ; version++) {
+		int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;  // Number of data bits available
+		dataUsedBits = getTotalBits(segs, len, version);
+		if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
+			break;  // This version number is found to be suitable
+		if (version >= maxVersion) {  // All versions in the range could not fit the given data
+			qrcode[0] = 0;  // Set size to invalid value for safety
+			return false;
+		}
+	}
+	assert(dataUsedBits != -1);
+	
+	// Increase the error correction level while the data still fits in the current version number
+	for (int i = (int)qrcodegen_Ecc_MEDIUM; i <= (int)qrcodegen_Ecc_HIGH; i++) {  // From low to high
+		if (boostEcl && dataUsedBits <= getNumDataCodewords(version, (enum qrcodegen_Ecc)i) * 8)
+			ecl = (enum qrcodegen_Ecc)i;
+	}
+	
+	// Concatenate all segments to create the data bit string
+	memset(qrcode, 0, qrcodegen_BUFFER_LEN_FOR_VERSION(version) * sizeof(qrcode[0]));
+	int bitLen = 0;
+	for (size_t i = 0; i < len; i++) {
+		const struct qrcodegen_Segment *seg = &segs[i];
+		appendBitsToBuffer((int)seg->mode, 4, qrcode, &bitLen);
+		appendBitsToBuffer(seg->numChars, numCharCountBits(seg->mode, version), qrcode, &bitLen);
+		for (int j = 0; j < seg->bitLength; j++)
+			appendBitsToBuffer((seg->data[j >> 3] >> (7 - (j & 7))) & 1, 1, qrcode, &bitLen);
+	}
+	assert(bitLen == dataUsedBits);
+	
+	// Add terminator and pad up to a byte if applicable
+	int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;
+	assert(bitLen <= dataCapacityBits);
+	int terminatorBits = dataCapacityBits - bitLen;
+	if (terminatorBits > 4)
+		terminatorBits = 4;
+	appendBitsToBuffer(0, terminatorBits, qrcode, &bitLen);
+	appendBitsToBuffer(0, (8 - bitLen % 8) % 8, qrcode, &bitLen);
+	assert(bitLen % 8 == 0);
+	
+	// Pad with alternating bytes until data capacity is reached
+	for (uint8_t padByte = 0xEC; bitLen < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
+		appendBitsToBuffer(padByte, 8, qrcode, &bitLen);
+	
+	// Draw function and data codeword modules
+	addEccAndInterleave(qrcode, version, ecl, tempBuffer);
+	initializeFunctionModules(version, qrcode);
+	drawCodewords(tempBuffer, getNumRawDataModules(version) / 8, qrcode);
+	drawWhiteFunctionModules(qrcode, version);
+	initializeFunctionModules(version, tempBuffer);
+	
+	// Handle masking
+	if (mask == qrcodegen_Mask_AUTO) {  // Automatically choose best mask
+		long minPenalty = LONG_MAX;
+		for (int i = 0; i < 8; i++) {
+			enum qrcodegen_Mask msk = (enum qrcodegen_Mask)i;
+			applyMask(tempBuffer, qrcode, msk);
+			drawFormatBits(ecl, msk, qrcode);
+			long penalty = getPenaltyScore(qrcode);
+			if (penalty < minPenalty) {
+				mask = msk;
+				minPenalty = penalty;
+			}
+			applyMask(tempBuffer, qrcode, msk);  // Undoes the mask due to XOR
+		}
+	}
+	assert(0 <= (int)mask && (int)mask <= 7);
+	applyMask(tempBuffer, qrcode, mask);
+	drawFormatBits(ecl, mask, qrcode);
+	return true;
+}
+
+
+
+/*---- Error correction code generation functions ----*/
+
+// Appends error correction bytes to each block of the given data array, then interleaves
+// bytes from the blocks and stores them in the result array. data[0 : dataLen] contains
+// the input data. data[dataLen : rawCodewords] is used as a temporary work area and will
+// be clobbered by this function. The final answer is stored in result[0 : rawCodewords].
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]) {
+	// Calculate parameter numbers
+	assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+	int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version];
+	int blockEccLen = ECC_CODEWORDS_PER_BLOCK  [(int)ecl][version];
+	int rawCodewords = getNumRawDataModules(version) / 8;
+	int dataLen = getNumDataCodewords(version, ecl);
+	int numShortBlocks = numBlocks - rawCodewords % numBlocks;
+	int shortBlockDataLen = rawCodewords / numBlocks - blockEccLen;
+	
+	// Split data into blocks, calculate ECC, and interleave
+	// (not concatenate) the bytes into a single sequence
+	uint8_t generator[qrcodegen_REED_SOLOMON_DEGREE_MAX];
+	calcReedSolomonGenerator(blockEccLen, generator);
+	const uint8_t *dat = data;
+	for (int i = 0; i < numBlocks; i++) {
+		int datLen = shortBlockDataLen + (i < numShortBlocks ? 0 : 1);
+		uint8_t *ecc = &data[dataLen];  // Temporary storage
+		calcReedSolomonRemainder(dat, datLen, generator, blockEccLen, ecc);
+		for (int j = 0, k = i; j < datLen; j++, k += numBlocks) {  // Copy data
+			if (j == shortBlockDataLen)
+				k -= numShortBlocks;
+			result[k] = dat[j];
+		}
+		for (int j = 0, k = dataLen + i; j < blockEccLen; j++, k += numBlocks)  // Copy ECC
+			result[k] = ecc[j];
+		dat += datLen;
+	}
+}
+
+
+// Returns the number of 8-bit codewords that can be used for storing data (not ECC),
+// for the given version number and error correction level. The result is in the range [9, 2956].
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl) {
+	int v = version, e = (int)ecl;
+	assert(0 <= e && e < 4);
+	return getNumRawDataModules(v) / 8
+		- ECC_CODEWORDS_PER_BLOCK    [e][v]
+		* NUM_ERROR_CORRECTION_BLOCKS[e][v];
+}
+
+
+// Returns the number of data bits that can be stored in a QR Code of the given version number, after
+// all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8.
+// The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table.
+testable int getNumRawDataModules(int ver) {
+	assert(qrcodegen_VERSION_MIN <= ver && ver <= qrcodegen_VERSION_MAX);
+	int result = (16 * ver + 128) * ver + 64;
+	if (ver >= 2) {
+		int numAlign = ver / 7 + 2;
+		result -= (25 * numAlign - 10) * numAlign - 55;
+		if (ver >= 7)
+			result -= 36;
+	}
+	return result;
+}
+
+
+
+/*---- Reed-Solomon ECC generator functions ----*/
+
+// Calculates the Reed-Solomon generator polynomial of the given degree, storing in result[0 : degree].
+testable void calcReedSolomonGenerator(int degree, uint8_t result[]) {
+	// Start with the monomial x^0
+	assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+	memset(result, 0, degree * sizeof(result[0]));
+	result[degree - 1] = 1;
+	
+	// Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}),
+	// drop the highest term, and store the rest of the coefficients in order of descending powers.
+	// Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
+	uint8_t root = 1;
+	for (int i = 0; i < degree; i++) {
+		// Multiply the current product by (x - r^i)
+		for (int j = 0; j < degree; j++) {
+			result[j] = finiteFieldMultiply(result[j], root);
+			if (j + 1 < degree)
+				result[j] ^= result[j + 1];
+		}
+		root = finiteFieldMultiply(root, 0x02);
+	}
+}
+
+
+// Calculates the remainder of the polynomial data[0 : dataLen] when divided by the generator[0 : degree], where all
+// polynomials are in big endian and the generator has an implicit leading 1 term, storing the result in result[0 : degree].
+testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
+		const uint8_t generator[], int degree, uint8_t result[]) {
+	
+	// Perform polynomial division
+	assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+	memset(result, 0, degree * sizeof(result[0]));
+	for (int i = 0; i < dataLen; i++) {
+		uint8_t factor = data[i] ^ result[0];
+		memmove(&result[0], &result[1], (degree - 1) * sizeof(result[0]));
+		result[degree - 1] = 0;
+		for (int j = 0; j < degree; j++)
+			result[j] ^= finiteFieldMultiply(generator[j], factor);
+	}
+}
+
+#undef qrcodegen_REED_SOLOMON_DEGREE_MAX
+
+
+// Returns the product of the two given field elements modulo GF(2^8/0x11D).
+// All inputs are valid. This could be implemented as a 256*256 lookup table.
+testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y) {
+	// Russian peasant multiplication
+	uint8_t z = 0;
+	for (int i = 7; i >= 0; i--) {
+		z = (z << 1) ^ ((z >> 7) * 0x11D);
+		z ^= ((y >> i) & 1) * x;
+	}
+	return z;
+}
+
+
+
+/*---- Drawing function modules ----*/
+
+// Clears the given QR Code grid with white modules for the given
+// version's size, then marks every function module as black.
+testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
+	// Initialize QR Code
+	int qrsize = version * 4 + 17;
+	memset(qrcode, 0, ((qrsize * qrsize + 7) / 8 + 1) * sizeof(qrcode[0]));
+	qrcode[0] = (uint8_t)qrsize;
+	
+	// Fill horizontal and vertical timing patterns
+	fillRectangle(6, 0, 1, qrsize, qrcode);
+	fillRectangle(0, 6, qrsize, 1, qrcode);
+	
+	// Fill 3 finder patterns (all corners except bottom right) and format bits
+	fillRectangle(0, 0, 9, 9, qrcode);
+	fillRectangle(qrsize - 8, 0, 8, 9, qrcode);
+	fillRectangle(0, qrsize - 8, 9, 8, qrcode);
+	
+	// Fill numerous alignment patterns
+	uint8_t alignPatPos[7];
+	int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+	for (int i = 0; i < numAlign; i++) {
+		for (int j = 0; j < numAlign; j++) {
+			// Don't draw on the three finder corners
+			if (!((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0)))
+				fillRectangle(alignPatPos[i] - 2, alignPatPos[j] - 2, 5, 5, qrcode);
+		}
+	}
+	
+	// Fill version blocks
+	if (version >= 7) {
+		fillRectangle(qrsize - 11, 0, 3, 6, qrcode);
+		fillRectangle(0, qrsize - 11, 6, 3, qrcode);
+	}
+}
+
+
+// Draws white function modules and possibly some black modules onto the given QR Code, without changing
+// non-function modules. This does not draw the format bits. This requires all function modules to be previously
+// marked black (namely by initializeFunctionModules()), because this may skip redrawing black function modules.
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
+	// Draw horizontal and vertical timing patterns
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int i = 7; i < qrsize - 7; i += 2) {
+		setModule(qrcode, 6, i, false);
+		setModule(qrcode, i, 6, false);
+	}
+	
+	// Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
+	for (int dy = -4; dy <= 4; dy++) {
+		for (int dx = -4; dx <= 4; dx++) {
+			int dist = abs(dx);
+			if (abs(dy) > dist)
+				dist = abs(dy);
+			if (dist == 2 || dist == 4) {
+				setModuleBounded(qrcode, 3 + dx, 3 + dy, false);
+				setModuleBounded(qrcode, qrsize - 4 + dx, 3 + dy, false);
+				setModuleBounded(qrcode, 3 + dx, qrsize - 4 + dy, false);
+			}
+		}
+	}
+	
+	// Draw numerous alignment patterns
+	uint8_t alignPatPos[7];
+	int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+	for (int i = 0; i < numAlign; i++) {
+		for (int j = 0; j < numAlign; j++) {
+			if ((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0))
+				continue;  // Don't draw on the three finder corners
+			for (int dy = -1; dy <= 1; dy++) {
+				for (int dx = -1; dx <= 1; dx++)
+					setModule(qrcode, alignPatPos[i] + dx, alignPatPos[j] + dy, dx == 0 && dy == 0);
+			}
+		}
+	}
+	
+	// Draw version blocks
+	if (version >= 7) {
+		// Calculate error correction code and pack bits
+		int rem = version;  // version is uint6, in the range [7, 40]
+		for (int i = 0; i < 12; i++)
+			rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
+		long bits = (long)version << 12 | rem;  // uint18
+		assert(bits >> 18 == 0);
+		
+		// Draw two copies
+		for (int i = 0; i < 6; i++) {
+			for (int j = 0; j < 3; j++) {
+				int k = qrsize - 11 + j;
+				setModule(qrcode, k, i, (bits & 1) != 0);
+				setModule(qrcode, i, k, (bits & 1) != 0);
+				bits >>= 1;
+			}
+		}
+	}
+}
+
+
+// Draws two copies of the format bits (with its own error correction code) based
+// on the given mask and error correction level. This always draws all modules of
+// the format bits, unlike drawWhiteFunctionModules() which might skip black modules.
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]) {
+	// Calculate error correction code and pack bits
+	assert(0 <= (int)mask && (int)mask <= 7);
+	static const int table[] = {1, 0, 3, 2};
+	int data = table[(int)ecl] << 3 | (int)mask;  // errCorrLvl is uint2, mask is uint3
+	int rem = data;
+	for (int i = 0; i < 10; i++)
+		rem = (rem << 1) ^ ((rem >> 9) * 0x537);
+	int bits = (data << 10 | rem) ^ 0x5412;  // uint15
+	assert(bits >> 15 == 0);
+	
+	// Draw first copy
+	for (int i = 0; i <= 5; i++)
+		setModule(qrcode, 8, i, getBit(bits, i));
+	setModule(qrcode, 8, 7, getBit(bits, 6));
+	setModule(qrcode, 8, 8, getBit(bits, 7));
+	setModule(qrcode, 7, 8, getBit(bits, 8));
+	for (int i = 9; i < 15; i++)
+		setModule(qrcode, 14 - i, 8, getBit(bits, i));
+	
+	// Draw second copy
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int i = 0; i < 8; i++)
+		setModule(qrcode, qrsize - 1 - i, 8, getBit(bits, i));
+	for (int i = 8; i < 15; i++)
+		setModule(qrcode, 8, qrsize - 15 + i, getBit(bits, i));
+	setModule(qrcode, 8, qrsize - 8, true);  // Always black
+}
+
+
+// Calculates and stores an ascending list of positions of alignment patterns
+// for this version number, returning the length of the list (in the range [0,7]).
+// Each position is in the range [0,177), and are used on both the x and y axes.
+// This could be implemented as lookup table of 40 variable-length lists of unsigned bytes.
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
+	if (version == 1)
+		return 0;
+	int numAlign = version / 7 + 2;
+	int step = (version == 32) ? 26 :
+		(version*4 + numAlign*2 + 1) / (numAlign*2 - 2) * 2;
+	for (int i = numAlign - 1, pos = version * 4 + 10; i >= 1; i--, pos -= step)
+		result[i] = pos;
+	result[0] = 6;
+	return numAlign;
+}
+
+
+// Sets every pixel in the range [left : left + width] * [top : top + height] to black.
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) {
+	for (int dy = 0; dy < height; dy++) {
+		for (int dx = 0; dx < width; dx++)
+			setModule(qrcode, left + dx, top + dy, true);
+	}
+}
+
+
+
+/*---- Drawing data modules and masking ----*/
+
+// Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state of
+// the QR Code to be black at function modules and white at codeword modules (including unused remainder bits).
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
+	int qrsize = qrcodegen_getSize(qrcode);
+	int i = 0;  // Bit index into the data
+	// Do the funny zigzag scan
+	for (int right = qrsize - 1; right >= 1; right -= 2) {  // Index of right column in each column pair
+		if (right == 6)
+			right = 5;
+		for (int vert = 0; vert < qrsize; vert++) {  // Vertical counter
+			for (int j = 0; j < 2; j++) {
+				int x = right - j;  // Actual x coordinate
+				bool upward = ((right + 1) & 2) == 0;
+				int y = upward ? qrsize - 1 - vert : vert;  // Actual y coordinate
+				if (!getModule(qrcode, x, y) && i < dataLen * 8) {
+					bool black = getBit(data[i >> 3], 7 - (i & 7));
+					setModule(qrcode, x, y, black);
+					i++;
+				}
+				// If this QR Code has any remainder bits (0 to 7), they were assigned as
+				// 0/false/white by the constructor and are left unchanged by this method
+			}
+		}
+	}
+	assert(i == dataLen * 8);
+}
+
+
+// XORs the codeword modules in this QR Code with the given mask pattern.
+// The function modules must be marked and the codeword bits must be drawn
+// before masking. Due to the arithmetic of XOR, calling applyMask() with
+// the same mask value a second time will undo the mask. A final well-formed
+// QR Code needs exactly one (not zero, two, etc.) mask applied.
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask) {
+	assert(0 <= (int)mask && (int)mask <= 7);  // Disallows qrcodegen_Mask_AUTO
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int y = 0; y < qrsize; y++) {
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(functionModules, x, y))
+				continue;
+			bool invert;
+			switch ((int)mask) {
+				case 0:  invert = (x + y) % 2 == 0;                    break;
+				case 1:  invert = y % 2 == 0;                          break;
+				case 2:  invert = x % 3 == 0;                          break;
+				case 3:  invert = (x + y) % 3 == 0;                    break;
+				case 4:  invert = (x / 3 + y / 2) % 2 == 0;            break;
+				case 5:  invert = x * y % 2 + x * y % 3 == 0;          break;
+				case 6:  invert = (x * y % 2 + x * y % 3) % 2 == 0;    break;
+				case 7:  invert = ((x + y) % 2 + x * y % 3) % 2 == 0;  break;
+				default:  assert(false);  return;
+			}
+			bool val = getModule(qrcode, x, y);
+			setModule(qrcode, x, y, val ^ invert);
+		}
+	}
+}
+
+
+// Calculates and returns the penalty score based on state of the given QR Code's current modules.
+// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
+static long getPenaltyScore(const uint8_t qrcode[]) {
+	int qrsize = qrcodegen_getSize(qrcode);
+	long result = 0;
+	
+	// Adjacent modules in row having same color, and finder-like patterns
+	for (int y = 0; y < qrsize; y++) {
+		unsigned char runHistory[7] = {0};
+		bool color = false;
+		unsigned char runX = 0;
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(qrcode, x, y) == color) {
+				runX++;
+				if (runX == 5)
+					result += PENALTY_N1;
+				else if (runX > 5)
+					result++;
+			} else {
+				addRunToHistory(runX, runHistory);
+				if (!color && hasFinderLikePattern(runHistory))
+					result += PENALTY_N3;
+				color = getModule(qrcode, x, y);
+				runX = 1;
+			}
+		}
+		addRunToHistory(runX, runHistory);
+		if (color)
+			addRunToHistory(0, runHistory);  // Dummy run of white
+		if (hasFinderLikePattern(runHistory))
+			result += PENALTY_N3;
+	}
+	// Adjacent modules in column having same color, and finder-like patterns
+	for (int x = 0; x < qrsize; x++) {
+		unsigned char runHistory[7] = {0};
+		bool color = false;
+		unsigned char runY = 0;
+		for (int y = 0; y < qrsize; y++) {
+			if (getModule(qrcode, x, y) == color) {
+				runY++;
+				if (runY == 5)
+					result += PENALTY_N1;
+				else if (runY > 5)
+					result++;
+			} else {
+				addRunToHistory(runY, runHistory);
+				if (!color && hasFinderLikePattern(runHistory))
+					result += PENALTY_N3;
+				color = getModule(qrcode, x, y);
+				runY = 1;
+			}
+		}
+		addRunToHistory(runY, runHistory);
+		if (color)
+			addRunToHistory(0, runHistory);  // Dummy run of white
+		if (hasFinderLikePattern(runHistory))
+			result += PENALTY_N3;
+	}
+	
+	// 2*2 blocks of modules having same color
+	for (int y = 0; y < qrsize - 1; y++) {
+		for (int x = 0; x < qrsize - 1; x++) {
+			bool  color = getModule(qrcode, x, y);
+			if (  color == getModule(qrcode, x + 1, y) &&
+			      color == getModule(qrcode, x, y + 1) &&
+			      color == getModule(qrcode, x + 1, y + 1))
+				result += PENALTY_N2;
+		}
+	}
+	
+	// Balance of black and white modules
+	int black = 0;
+	for (int y = 0; y < qrsize; y++) {
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(qrcode, x, y))
+				black++;
+		}
+	}
+	int total = qrsize * qrsize;  // Note that size is odd, so black/total != 1/2
+	// Compute the smallest integer k >= 0 such that (45-5k)% <= black/total <= (55+5k)%
+	int k = (int)((labs(black * 20L - total * 10L) + total - 1) / total) - 1;
+	result += k * PENALTY_N4;
+	return result;
+}
+
+
+// Inserts the given value to the front of the given array, which shifts over the
+// existing values and deletes the last value. A helper function for getPenaltyScore().
+static void addRunToHistory(unsigned char run, unsigned char history[7]) {
+	memmove(&history[1], &history[0], 6 * sizeof(history[0]));
+	history[0] = run;
+}
+
+
+// Tests whether the given run history has the pattern of ratio 1:1:3:1:1 in the middle, and
+// surrounded by at least 4 on either or both ends. A helper function for getPenaltyScore().
+// Must only be called immediately after a run of white modules has ended.
+static bool hasFinderLikePattern(const unsigned char runHistory[7]) {
+	unsigned char n = runHistory[1];
+	// The maximum QR Code size is 177, hence the run length n <= 177.
+	// Arithmetic is promoted to int, so n*4 will not overflow.
+	return n > 0 && runHistory[2] == n && runHistory[4] == n && runHistory[5] == n
+		&& runHistory[3] == n * 3 && (runHistory[0] >= n * 4 || runHistory[6] >= n * 4);
+}
+
+
+
+/*---- Basic QR Code information ----*/
+
+// Public function - see documentation comment in header file.
+int qrcodegen_getSize(const uint8_t qrcode[]) {
+	assert(qrcode != NULL);
+	int result = qrcode[0];
+	assert((qrcodegen_VERSION_MIN * 4 + 17) <= result
+		&& result <= (qrcodegen_VERSION_MAX * 4 + 17));
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) {
+	assert(qrcode != NULL);
+	int qrsize = qrcode[0];
+	return (0 <= x && x < qrsize && 0 <= y && y < qrsize) && getModule(qrcode, x, y);
+}
+
+
+// Gets the module at the given coordinates, which must be in bounds.
+testable bool getModule(const uint8_t qrcode[], int x, int y) {
+	int qrsize = qrcode[0];
+	assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+	int index = y * qrsize + x;
+	return getBit(qrcode[(index >> 3) + 1], index & 7);
+}
+
+
+// Sets the module at the given coordinates, which must be in bounds.
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack) {
+	int qrsize = qrcode[0];
+	assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+	int index = y * qrsize + x;
+	int bitIndex = index & 7;
+	int byteIndex = (index >> 3) + 1;
+	if (isBlack)
+		qrcode[byteIndex] |= 1 << bitIndex;
+	else
+		qrcode[byteIndex] &= (1 << bitIndex) ^ 0xFF;
+}
+
+
+// Sets the module at the given coordinates, doing nothing if out of bounds.
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack) {
+	int qrsize = qrcode[0];
+	if (0 <= x && x < qrsize && 0 <= y && y < qrsize)
+		setModule(qrcode, x, y, isBlack);
+}
+
+
+// Returns true iff the i'th bit of x is set to 1. Requires x >= 0 and 0 <= i <= 14.
+static bool getBit(int x, int i) {
+	return ((x >> i) & 1) != 0;
+}
+
+
+
+/*---- Segment handling ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isAlphanumeric(const char *text) {
+	assert(text != NULL);
+	for (; *text != '\0'; text++) {
+		if (strchr(ALPHANUMERIC_CHARSET, *text) == NULL)
+			return false;
+	}
+	return true;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isNumeric(const char *text) {
+	assert(text != NULL);
+	for (; *text != '\0'; text++) {
+		if (*text < '0' || *text > '9')
+			return false;
+	}
+	return true;
+}
+
+
+// Public function - see documentation comment in header file.
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars) {
+	int temp = calcSegmentBitLength(mode, numChars);
+	if (temp == -1)
+		return SIZE_MAX;
+	assert(0 <= temp && temp <= INT16_MAX);
+	return ((size_t)temp + 7) / 8;
+}
+
+
+// Returns the number of data bits needed to represent a segment
+// containing the given number of characters using the given mode. Notes:
+// - Returns -1 on failure, i.e. numChars > INT16_MAX or
+//   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+// - Otherwise, all valid results are in the range [0, INT16_MAX].
+// - For byte mode, numChars measures the number of bytes, not Unicode code points.
+// - For ECI mode, numChars must be 0, and the worst-case number of bits is returned.
+//   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars) {
+	// All calculations are designed to avoid overflow on all platforms
+	if (numChars > (unsigned int)INT16_MAX)
+		return -1;
+	long result = (long)numChars;
+	if (mode == qrcodegen_Mode_NUMERIC)
+		result = (result * 10 + 2) / 3;  // ceil(10/3 * n)
+	else if (mode == qrcodegen_Mode_ALPHANUMERIC)
+		result = (result * 11 + 1) / 2;  // ceil(11/2 * n)
+	else if (mode == qrcodegen_Mode_BYTE)
+		result *= 8;
+	else if (mode == qrcodegen_Mode_KANJI)
+		result *= 13;
+	else if (mode == qrcodegen_Mode_ECI && numChars == 0)
+		result = 3 * 8;
+	else {  // Invalid argument
+		assert(false);
+		return -1;
+	}
+	assert(result >= 0);
+	if ((unsigned int)result > (unsigned int)INT16_MAX)
+		return -1;
+	return (int)result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]) {
+	assert(data != NULL || len == 0);
+	struct qrcodegen_Segment result;
+	result.mode = qrcodegen_Mode_BYTE;
+	result.bitLength = calcSegmentBitLength(result.mode, len);
+	assert(result.bitLength != -1);
+	result.numChars = (int)len;
+	if (len > 0)
+		memcpy(buf, data, len * sizeof(buf[0]));
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]) {
+	assert(digits != NULL);
+	struct qrcodegen_Segment result;
+	size_t len = strlen(digits);
+	result.mode = qrcodegen_Mode_NUMERIC;
+	int bitLen = calcSegmentBitLength(result.mode, len);
+	assert(bitLen != -1);
+	result.numChars = (int)len;
+	if (bitLen > 0)
+		memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+	result.bitLength = 0;
+	
+	unsigned int accumData = 0;
+	int accumCount = 0;
+	for (; *digits != '\0'; digits++) {
+		char c = *digits;
+		assert('0' <= c && c <= '9');
+		accumData = accumData * 10 + (unsigned int)(c - '0');
+		accumCount++;
+		if (accumCount == 3) {
+			appendBitsToBuffer(accumData, 10, buf, &result.bitLength);
+			accumData = 0;
+			accumCount = 0;
+		}
+	}
+	if (accumCount > 0)  // 1 or 2 digits remaining
+		appendBitsToBuffer(accumData, accumCount * 3 + 1, buf, &result.bitLength);
+	assert(result.bitLength == bitLen);
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]) {
+	assert(text != NULL);
+	struct qrcodegen_Segment result;
+	size_t len = strlen(text);
+	result.mode = qrcodegen_Mode_ALPHANUMERIC;
+	int bitLen = calcSegmentBitLength(result.mode, len);
+	assert(bitLen != -1);
+	result.numChars = (int)len;
+	if (bitLen > 0)
+		memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+	result.bitLength = 0;
+	
+	unsigned int accumData = 0;
+	int accumCount = 0;
+	for (; *text != '\0'; text++) {
+		const char *temp = strchr(ALPHANUMERIC_CHARSET, *text);
+		assert(temp != NULL);
+		accumData = accumData * 45 + (unsigned int)(temp - ALPHANUMERIC_CHARSET);
+		accumCount++;
+		if (accumCount == 2) {
+			appendBitsToBuffer(accumData, 11, buf, &result.bitLength);
+			accumData = 0;
+			accumCount = 0;
+		}
+	}
+	if (accumCount > 0)  // 1 character remaining
+		appendBitsToBuffer(accumData, 6, buf, &result.bitLength);
+	assert(result.bitLength == bitLen);
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
+	struct qrcodegen_Segment result;
+	result.mode = qrcodegen_Mode_ECI;
+	result.numChars = 0;
+	result.bitLength = 0;
+	if (assignVal < 0) {
+		assert(false);
+	} else if (assignVal < (1 << 7)) {
+		memset(buf, 0, 1 * sizeof(buf[0]));
+		appendBitsToBuffer(assignVal, 8, buf, &result.bitLength);
+	} else if (assignVal < (1 << 14)) {
+		memset(buf, 0, 2 * sizeof(buf[0]));
+		appendBitsToBuffer(2, 2, buf, &result.bitLength);
+		appendBitsToBuffer(assignVal, 14, buf, &result.bitLength);
+	} else if (assignVal < 1000000L) {
+		memset(buf, 0, 3 * sizeof(buf[0]));
+		appendBitsToBuffer(6, 3, buf, &result.bitLength);
+		appendBitsToBuffer(assignVal >> 10, 11, buf, &result.bitLength);
+		appendBitsToBuffer(assignVal & 0x3FF, 10, buf, &result.bitLength);
+	} else {
+		assert(false);
+	}
+	result.data = buf;
+	return result;
+}
+
+
+// Calculates the number of bits needed to encode the given segments at the given version.
+// Returns a non-negative number if successful. Otherwise returns -1 if a segment has too
+// many characters to fit its length field, or the total bits exceeds INT16_MAX.
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version) {
+	assert(segs != NULL || len == 0);
+	long result = 0;
+	for (size_t i = 0; i < len; i++) {
+		int numChars  = segs[i].numChars;
+		int bitLength = segs[i].bitLength;
+		assert(0 <= numChars  && numChars  <= INT16_MAX);
+		assert(0 <= bitLength && bitLength <= INT16_MAX);
+		int ccbits = numCharCountBits(segs[i].mode, version);
+		assert(0 <= ccbits && ccbits <= 16);
+		if (numChars >= (1L << ccbits))
+			return -1;  // The segment's length doesn't fit the field's bit width
+		result += 4L + ccbits + bitLength;
+		if (result > INT16_MAX)
+			return -1;  // The sum might overflow an int type
+	}
+	assert(0 <= result && result <= INT16_MAX);
+	return (int)result;
+}
+
+
+// Returns the bit width of the character count field for a segment in the given mode
+// in a QR Code at the given version number. The result is in the range [0, 16].
+static int numCharCountBits(enum qrcodegen_Mode mode, int version) {
+	assert(qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+	int i = (version + 7) / 17;
+	switch (mode) {
+		case qrcodegen_Mode_NUMERIC     : { static const int temp[] = {10, 12, 14}; return temp[i]; }
+		case qrcodegen_Mode_ALPHANUMERIC: { static const int temp[] = { 9, 11, 13}; return temp[i]; }
+		case qrcodegen_Mode_BYTE        : { static const int temp[] = { 8, 16, 16}; return temp[i]; }
+		case qrcodegen_Mode_KANJI       : { static const int temp[] = { 8, 10, 12}; return temp[i]; }
+		case qrcodegen_Mode_ECI         : return 0;
+		default:  assert(false);  return -1;  // Dummy value
+	}
+}
+
+int qrcodegen_getMinFitVersion(enum qrcodegen_Ecc ecl, size_t dataLen)
+{
+	struct qrcodegen_Segment seg;
+	seg.mode = qrcodegen_Mode_BYTE;
+	seg.bitLength = calcSegmentBitLength(seg.mode, dataLen);
+	seg.numChars = (int)dataLen;
+
+	for (int version = qrcodegen_VERSION_MIN; version <= qrcodegen_VERSION_MAX; version++) {
+		int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;  // Number of data bits available
+		int dataUsedBits = getTotalBits(&seg, 1, version);
+		if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
+			return version;
+	}
+	return -1;
+}
+
+int qrcodegen_version2size(int version)
+{
+	if (version < qrcodegen_VERSION_MIN || version > qrcodegen_VERSION_MAX) {
+		return -1;
+	}
+
+	return ((version - 1)*4 + 21);
+}
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/qrcodegen.h b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/qrcodegen.h
new file mode 100644
index 000000000..dceddf605
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/libs/qrcode/qrcodegen.h
@@ -0,0 +1,319 @@
+/* 
+ * QR Code generator library (C)
+ * 
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* 
+ * This library creates QR Code symbols, which is a type of two-dimension barcode.
+ * Invented by Denso Wave and described in the ISO/IEC 18004 standard.
+ * A QR Code structure is an immutable square grid of black and white cells.
+ * The library provides functions to create a QR Code from text or binary data.
+ * The library covers the QR Code Model 2 specification, supporting all versions (sizes)
+ * from 1 to 40, all 4 error correction levels, and 4 character encoding modes.
+ * 
+ * Ways to create a QR Code object:
+ * - High level: Take the payload data and call qrcodegen_encodeText() or qrcodegen_encodeBinary().
+ * - Low level: Custom-make the list of segments and call
+ *   qrcodegen_encodeSegments() or qrcodegen_encodeSegmentsAdvanced().
+ * (Note that all ways require supplying the desired error correction level and various byte buffers.)
+ */
+
+
+/*---- Enum and struct types----*/
+
+/* 
+ * The error correction level in a QR Code symbol.
+ */
+enum qrcodegen_Ecc {
+	// Must be declared in ascending order of error protection
+	// so that an internal qrcodegen function works properly
+	qrcodegen_Ecc_LOW = 0 ,  // The QR Code can tolerate about  7% erroneous codewords
+	qrcodegen_Ecc_MEDIUM  ,  // The QR Code can tolerate about 15% erroneous codewords
+	qrcodegen_Ecc_QUARTILE,  // The QR Code can tolerate about 25% erroneous codewords
+	qrcodegen_Ecc_HIGH    ,  // The QR Code can tolerate about 30% erroneous codewords
+};
+
+
+/* 
+ * The mask pattern used in a QR Code symbol.
+ */
+enum qrcodegen_Mask {
+	// A special value to tell the QR Code encoder to
+	// automatically select an appropriate mask pattern
+	qrcodegen_Mask_AUTO = -1,
+	// The eight actual mask patterns
+	qrcodegen_Mask_0 = 0,
+	qrcodegen_Mask_1,
+	qrcodegen_Mask_2,
+	qrcodegen_Mask_3,
+	qrcodegen_Mask_4,
+	qrcodegen_Mask_5,
+	qrcodegen_Mask_6,
+	qrcodegen_Mask_7,
+};
+
+
+/* 
+ * Describes how a segment's data bits are interpreted.
+ */
+enum qrcodegen_Mode {
+	qrcodegen_Mode_NUMERIC      = 0x1,
+	qrcodegen_Mode_ALPHANUMERIC = 0x2,
+	qrcodegen_Mode_BYTE         = 0x4,
+	qrcodegen_Mode_KANJI        = 0x8,
+	qrcodegen_Mode_ECI          = 0x7,
+};
+
+
+/* 
+ * A segment of character/binary/control data in a QR Code symbol.
+ * The mid-level way to create a segment is to take the payload data
+ * and call a factory function such as qrcodegen_makeNumeric().
+ * The low-level way to create a segment is to custom-make the bit buffer
+ * and initialize a qrcodegen_Segment struct with appropriate values.
+ * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
+ * Any segment longer than this is meaningless for the purpose of generating QR Codes.
+ * Moreover, the maximum allowed bit length is 32767 because
+ * the largest QR Code (version 40) has 31329 modules.
+ */
+struct qrcodegen_Segment {
+	// The mode indicator of this segment.
+	enum qrcodegen_Mode mode;
+	
+	// The length of this segment's unencoded data. Measured in characters for
+	// numeric/alphanumeric/kanji mode, bytes for byte mode, and 0 for ECI mode.
+	// Always zero or positive. Not the same as the data's bit length.
+	int numChars;
+	
+	// The data bits of this segment, packed in bitwise big endian.
+	// Can be null if the bit length is zero.
+	uint8_t *data;
+	
+	// The number of valid data bits used in the buffer. Requires
+	// 0 <= bitLength <= 32767, and bitLength <= (capacity of data array) * 8.
+	// The character count (numChars) must agree with the mode and the bit buffer length.
+	int bitLength;
+};
+
+
+
+/*---- Macro constants and functions ----*/
+
+#define qrcodegen_VERSION_MIN   1  // The minimum version number supported in the QR Code Model 2 standard
+#define qrcodegen_VERSION_MAX  40  // The maximum version number supported in the QR Code Model 2 standard
+
+// Calculates the number of bytes needed to store any QR Code up to and including the given version number,
+// as a compile-time constant. For example, 'uint8_t buffer[qrcodegen_BUFFER_LEN_FOR_VERSION(25)];'
+// can store any single QR Code from version 1 to 25 (inclusive). The result fits in an int (or int16).
+// Requires qrcodegen_VERSION_MIN <= n <= qrcodegen_VERSION_MAX.
+#define qrcodegen_BUFFER_LEN_FOR_VERSION(n)  ((((n) * 4 + 17) * ((n) * 4 + 17) + 7) / 8 + 1)
+
+// The worst-case number of bytes needed to store one QR Code, up to and including
+// version 40. This value equals 3918, which is just under 4 kilobytes.
+// Use this more convenient value to avoid calculating tighter memory bounds for buffers.
+#define qrcodegen_BUFFER_LEN_MAX  qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)
+
+
+
+/*---- Functions (high level) to generate QR Codes ----*/
+
+/* 
+ * Encodes the given text string to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input text must be encoded in UTF-8 and contain no NULs.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays tempBuffer and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, tempBuffer contains no useful data.
+ * - If successful, the resulting QR Code may use numeric,
+ *   alphanumeric, or byte mode to encode the text.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC
+ *   can hold any UTF-8 string up to 2953 bytes, or any alphanumeric string
+ *   up to 4296 characters, or any digit string up to 7089 characters.
+ *   These numbers represent the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/* 
+ * Encodes the given binary data to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input array range dataAndTemp[0 : dataLen] should normally be
+ *   valid UTF-8 text, but is not required by the QR Code standard.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays dataAndTemp and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, the contents of dataAndTemp may have changed,
+ *   and does not represent useful data anymore.
+ * - If successful, the resulting QR Code will use byte mode to encode the data.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC can hold any byte
+ *   sequence up to length 2953. This is the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*---- Functions (low level) to generate QR Codes ----*/
+
+/* 
+ * Renders a QR Code representing the given segments at the given error correction level.
+ * The smallest possible QR Code version is automatically chosen for the output. Returns true if
+ * QR Code creation succeeded, or false if the data is too long to fit in any version. The ECC level
+ * of the result may be higher than the ecl argument if it can be done without increasing the version.
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+	enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/* 
+ * Renders a QR Code representing the given segments with the given encoding parameters.
+ * Returns true if QR Code creation succeeded, or false if the data is too long to fit in the range of versions.
+ * The smallest possible QR Code version within the given range is automatically
+ * chosen for the output. Iff boostEcl is true, then the ECC level of the result
+ * may be higher than the ecl argument if it can be done without increasing the
+ * version. The mask number is either between 0 to 7 (inclusive) to force that
+ * mask, or -1 to automatically choose an appropriate mask (which may be slow).
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+	int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/* 
+ * Tests whether the given string can be encoded as a segment in alphanumeric mode.
+ * A string is encodable iff each character is in the following set: 0 to 9, A to Z
+ * (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+bool qrcodegen_isAlphanumeric(const char *text);
+
+
+/* 
+ * Tests whether the given string can be encoded as a segment in numeric mode.
+ * A string is encodable iff each character is in the range 0 to 9.
+ */
+bool qrcodegen_isNumeric(const char *text);
+
+
+/* 
+ * Returns the number of bytes (uint8_t) needed for the data buffer of a segment
+ * containing the given number of characters using the given mode. Notes:
+ * - Returns SIZE_MAX on failure, i.e. numChars > INT16_MAX or
+ *   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+ * - Otherwise, all valid results are in the range [0, ceil(INT16_MAX / 8)], i.e. at most 4096.
+ * - It is okay for the user to allocate more bytes for the buffer than needed.
+ * - For byte mode, numChars measures the number of bytes, not Unicode code points.
+ * - For ECI mode, numChars must be 0, and the worst-case number of bytes is returned.
+ *   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+ */
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars);
+
+
+/* 
+ * Returns a segment representing the given binary data encoded in
+ * byte mode. All input byte arrays are acceptable. Any text string
+ * can be converted to UTF-8 bytes and encoded as a byte mode segment.
+ */
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]);
+
+
+/* 
+ * Returns a segment representing the given string of decimal digits encoded in numeric mode.
+ */
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]);
+
+
+/* 
+ * Returns a segment representing the given text string encoded in alphanumeric mode.
+ * The characters allowed are: 0 to 9, A to Z (uppercase only), space,
+ * dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]);
+
+
+/* 
+ * Returns a segment representing an Extended Channel Interpretation
+ * (ECI) designator with the given assignment value.
+ */
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
+
+
+/*---- Functions to extract raw data from QR Codes ----*/
+
+/* 
+ * Returns the side length of the given QR Code, assuming that encoding succeeded.
+ * The result is in the range [21, 177]. Note that the length of the array buffer
+ * is related to the side length - every 'uint8_t qrcode[]' must have length at least
+ * qrcodegen_BUFFER_LEN_FOR_VERSION(version), which equals ceil(size^2 / 8 + 1).
+ */
+int qrcodegen_getSize(const uint8_t qrcode[]);
+
+
+/* 
+ * Returns the color of the module (pixel) at the given coordinates, which is false
+ * for white or true for black. The top left corner has the coordinates (x=0, y=0).
+ * If the given coordinates are out of bounds, then false (white) is returned.
+ */
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y);
+
+/* 
+ * Returns the qrcode size of the specified version. Returns -1 on failure
+ */
+int qrcodegen_version2size(int version);
+/* 
+ * Returns the min version of the data that can be stored. Returns -1 on failure
+ */
+int qrcodegen_getMinFitVersion(enum qrcodegen_Ecc ecl, size_t dataLen);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/lv_extra.c b/lib/libesp32_lvgl/lvgl/src/extra/lv_extra.c
index 1f5765b8a..17707a3a7 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/lv_extra.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/lv_extra.c
@@ -71,9 +71,16 @@ void lv_extra_init(void)
 #endif
 
 #if LV_USE_FREETYPE
-    /*Init freetype library
-     *Cache max 64 faces and 1 size*/
-    lv_freetype_init(0, 0, LV_FREETYPE_CACHE_SIZE);
+    /*Init freetype library*/
+#  if LV_FREETYPE_CACHE_SIZE >= 0
+    lv_freetype_init(LV_FREETYPE_CACHE_FT_FACES, LV_FREETYPE_CACHE_FT_SIZES, LV_FREETYPE_CACHE_SIZE);
+#  else
+    lv_freetype_init(0, 0, 0);
+#  endif
+#endif
+
+#if LV_USE_FFMPEG
+    lv_ffmpeg_init();
 #endif
 }
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/gridnav/lv_gridnav.c b/lib/libesp32_lvgl/lvgl/src/extra/others/gridnav/lv_gridnav.c
new file mode 100644
index 000000000..874e6a982
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/gridnav/lv_gridnav.c
@@ -0,0 +1,354 @@
+/**
+ * @file lv_gridnav.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_gridnav.h"
+#if LV_USE_GRIDNAV
+
+#include "../../../misc/lv_assert.h"
+#include "../../../misc/lv_math.h"
+#include "../../../core/lv_indev.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+typedef struct {
+    lv_gridnav_ctrl_t ctrl;
+    lv_obj_t * focused_obj;
+} lv_gridnav_dsc_t;
+
+typedef enum {
+    FIND_LEFT,
+    FIND_RIGHT,
+    FIND_TOP,
+    FIND_BOTTOM,
+    FIND_NEXT_ROW_FIRST_ITEM,
+    FIND_PREV_ROW_LAST_ITEM,
+    FIND_FIRST_ROW,
+    FIND_LAST_ROW,
+} find_mode_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static void gridnav_event_cb(lv_event_t * e);
+static lv_obj_t * find_chid(lv_obj_t * obj, lv_obj_t * start_child, find_mode_t mode);
+static lv_obj_t * find_first_focusable(lv_obj_t * obj);
+static lv_obj_t * find_last_focusable(lv_obj_t * obj);
+static bool obj_is_focuable(lv_obj_t * obj);
+static lv_coord_t get_x_center(lv_obj_t * obj);
+static lv_coord_t get_y_center(lv_obj_t * obj);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_gridnav_add(lv_obj_t * obj, lv_gridnav_ctrl_t ctrl)
+{
+    lv_gridnav_remove(obj); /*Be sure to not add gridnav twice*/
+
+    lv_gridnav_dsc_t * dsc = lv_mem_alloc(sizeof(lv_gridnav_dsc_t));
+    LV_ASSERT_MALLOC(dsc);
+    dsc->ctrl = ctrl;
+    dsc->focused_obj = NULL;
+    lv_obj_add_event_cb(obj, gridnav_event_cb, LV_EVENT_ALL, dsc);
+
+    lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_WITH_ARROW);
+}
+
+void lv_gridnav_remove(lv_obj_t * obj)
+{
+    lv_gridnav_dsc_t * dsc = lv_obj_get_event_user_data(obj, gridnav_event_cb);
+    if(dsc == NULL) return; /* no gridnav on this object */
+
+    lv_mem_free(dsc);
+    lv_obj_remove_event_cb(obj, gridnav_event_cb);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void gridnav_event_cb(lv_event_t * e)
+{
+    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_gridnav_dsc_t * dsc = lv_event_get_user_data(e);
+    lv_event_code_t code = lv_event_get_code(e);
+
+    if(code == LV_EVENT_KEY) {
+        uint32_t child_cnt = lv_obj_get_child_cnt(obj);
+        if(child_cnt == 0) return;
+
+        if(dsc->focused_obj == NULL) dsc->focused_obj = find_first_focusable(obj);
+        if(dsc->focused_obj == NULL) return;
+
+        uint32_t key = lv_indev_get_key(lv_indev_get_act());
+        lv_obj_t * guess = NULL;
+
+        if(key == LV_KEY_RIGHT) {
+            if((dsc->ctrl & LV_GRIDNAV_CTRL_SCROLL_FIRST) && lv_obj_has_flag(dsc->focused_obj, LV_OBJ_FLAG_SCROLLABLE) &&
+               lv_obj_get_scroll_right(dsc->focused_obj) > 0) {
+                lv_coord_t d = lv_obj_get_width(dsc->focused_obj) / 4;
+                if(d <= 0) d = 1;
+                lv_obj_scroll_by_bounded(dsc->focused_obj, -d, 0, LV_ANIM_ON);
+            }
+            else {
+                guess = find_chid(obj, dsc->focused_obj, FIND_RIGHT);
+                if(guess == NULL) {
+                    if(dsc->ctrl & LV_GRIDNAV_CTRL_ROLLOVER) {
+                        guess = find_chid(obj, dsc->focused_obj, FIND_NEXT_ROW_FIRST_ITEM);
+                        if(guess == NULL) guess = find_first_focusable(obj);
+                    }
+                    else {
+                        lv_group_focus_next(lv_obj_get_group(obj));
+                    }
+                }
+            }
+        }
+        else if(key == LV_KEY_LEFT) {
+            if((dsc->ctrl & LV_GRIDNAV_CTRL_SCROLL_FIRST) && lv_obj_has_flag(dsc->focused_obj, LV_OBJ_FLAG_SCROLLABLE) &&
+               lv_obj_get_scroll_left(dsc->focused_obj) > 0) {
+                lv_coord_t d = lv_obj_get_width(dsc->focused_obj) / 4;
+                if(d <= 0) d = 1;
+                lv_obj_scroll_by_bounded(dsc->focused_obj, d, 0, LV_ANIM_ON);
+            }
+            else {
+                guess = find_chid(obj, dsc->focused_obj, FIND_LEFT);
+                if(guess == NULL) {
+                    if(dsc->ctrl & LV_GRIDNAV_CTRL_ROLLOVER) {
+                        guess = find_chid(obj, dsc->focused_obj, FIND_PREV_ROW_LAST_ITEM);
+                        if(guess == NULL) guess = find_last_focusable(obj);
+                    }
+                    else {
+                        lv_group_focus_prev(lv_obj_get_group(obj));
+                    }
+                }
+            }
+        }
+        else if(key == LV_KEY_DOWN) {
+            if((dsc->ctrl & LV_GRIDNAV_CTRL_SCROLL_FIRST) && lv_obj_has_flag(dsc->focused_obj, LV_OBJ_FLAG_SCROLLABLE) &&
+               lv_obj_get_scroll_bottom(dsc->focused_obj) > 0) {
+                lv_coord_t d = lv_obj_get_height(dsc->focused_obj) / 4;
+                if(d <= 0) d = 1;
+                lv_obj_scroll_by_bounded(dsc->focused_obj, 0, -d, LV_ANIM_ON);
+            }
+            else {
+                guess = find_chid(obj, dsc->focused_obj, FIND_BOTTOM);
+                if(guess == NULL) {
+                    if(dsc->ctrl & LV_GRIDNAV_CTRL_ROLLOVER) {
+                        guess = find_chid(obj, dsc->focused_obj, FIND_FIRST_ROW);
+                    }
+                    else {
+                        lv_group_focus_next(lv_obj_get_group(obj));
+                    }
+                }
+            }
+        }
+        else if(key == LV_KEY_UP) {
+            if((dsc->ctrl & LV_GRIDNAV_CTRL_SCROLL_FIRST) && lv_obj_has_flag(dsc->focused_obj, LV_OBJ_FLAG_SCROLLABLE) &&
+               lv_obj_get_scroll_top(dsc->focused_obj) > 0) {
+                lv_coord_t d = lv_obj_get_height(dsc->focused_obj) / 4;
+                if(d <= 0) d = 1;
+                lv_obj_scroll_by_bounded(dsc->focused_obj, 0, d, LV_ANIM_ON);
+            }
+            else {
+                guess = find_chid(obj, dsc->focused_obj, FIND_TOP);
+                if(guess == NULL) {
+                    if(dsc->ctrl & LV_GRIDNAV_CTRL_ROLLOVER) {
+                        guess = find_chid(obj, dsc->focused_obj, FIND_LAST_ROW);
+                    }
+                    else {
+                        lv_group_focus_prev(lv_obj_get_group(obj));
+                    }
+                }
+            }
+        }
+        else {
+            if(lv_group_get_focused(lv_obj_get_group(obj)) == obj) {
+                lv_event_send(dsc->focused_obj, LV_EVENT_KEY, &key);
+            }
+        }
+
+        if(guess && guess != dsc->focused_obj) {
+            lv_obj_clear_state(dsc->focused_obj, LV_STATE_FOCUSED | LV_STATE_FOCUS_KEY);
+            lv_obj_add_state(guess, LV_STATE_FOCUSED | LV_STATE_FOCUS_KEY);
+            lv_obj_scroll_to_view(guess, LV_ANIM_ON);
+            dsc->focused_obj = guess;
+        }
+    }
+    else if(code == LV_EVENT_FOCUSED) {
+        if(dsc->focused_obj == NULL)  dsc->focused_obj = find_first_focusable(obj);
+        if(dsc->focused_obj) {
+            lv_obj_add_state(dsc->focused_obj, LV_STATE_FOCUSED | LV_STATE_FOCUS_KEY);
+            lv_obj_scroll_to_view(dsc->focused_obj, LV_ANIM_OFF);
+        }
+    }
+    else if(code == LV_EVENT_DEFOCUSED) {
+        if(dsc->focused_obj) {
+            lv_obj_clear_state(dsc->focused_obj, LV_STATE_FOCUSED | LV_STATE_FOCUS_KEY);
+        }
+    }
+    else if(code == LV_EVENT_CHILD_CREATED) {
+        lv_obj_t * child = lv_event_get_target(e);
+        if(lv_obj_get_parent(child) == obj) {
+            if(dsc->focused_obj == NULL) {
+                dsc->focused_obj = child;
+                if(lv_obj_has_state(obj, LV_STATE_FOCUSED)) {
+                    lv_obj_add_state(child, LV_STATE_FOCUSED | LV_STATE_FOCUS_KEY);
+                    lv_obj_scroll_to_view(child, LV_ANIM_OFF);
+                }
+            }
+        }
+    }
+    else if(code == LV_EVENT_CHILD_DELETED) {
+        /*This event bubble, so be sure this object's child was deleted.
+         *As we don't know which object was deleted we can't make the next focused.
+         *So make the first object focused*/
+        lv_obj_t * target = lv_event_get_target(e);
+        if(target == obj) {
+            dsc->focused_obj = find_first_focusable(obj);
+        }
+    }
+    else if(code == LV_EVENT_DELETE) {
+        lv_gridnav_remove(obj);
+    }
+    else if(code == LV_EVENT_PRESSED || code == LV_EVENT_PRESSING || code == LV_EVENT_PRESS_LOST ||
+            code == LV_EVENT_LONG_PRESSED || code == LV_EVENT_LONG_PRESSED_REPEAT ||
+            code == LV_EVENT_CLICKED || code == LV_EVENT_RELEASED) {
+        if(lv_group_get_focused(lv_obj_get_group(obj)) == obj) {
+            /*Forward press/release related event too*/
+            lv_indev_type_t t = lv_indev_get_type(lv_indev_get_act());
+            if(t == LV_INDEV_TYPE_ENCODER || t == LV_INDEV_TYPE_KEYPAD) {
+                lv_event_send(dsc->focused_obj, code, lv_indev_get_act());
+            }
+        }
+    }
+}
+
+static lv_obj_t * find_chid(lv_obj_t * obj, lv_obj_t * start_child, find_mode_t mode)
+{
+    lv_coord_t x_start = get_x_center(start_child);
+    lv_coord_t y_start = get_y_center(start_child);
+    uint32_t child_cnt = lv_obj_get_child_cnt(obj);
+    lv_obj_t * guess = NULL;
+    lv_coord_t x_err_guess = LV_COORD_MAX;
+    lv_coord_t y_err_guess = LV_COORD_MAX;
+    lv_coord_t h_half = lv_obj_get_height(start_child) / 2;
+    lv_coord_t h_max = lv_obj_get_height(obj) + lv_obj_get_scroll_top(obj) + lv_obj_get_scroll_bottom(obj);
+    uint32_t i;
+    for(i = 0; i < child_cnt; i++) {
+        lv_obj_t * child = lv_obj_get_child(obj, i);
+        if(child == start_child) continue;
+        if(obj_is_focuable(child) == false) continue;
+
+        lv_coord_t x_err = 0;
+        lv_coord_t y_err = 0;
+        switch(mode) {
+            case FIND_LEFT:
+                x_err = get_x_center(child) - x_start;
+                y_err = get_y_center(child) - y_start;
+                if(x_err >= 0) continue;    /*It's on the right*/
+                if(LV_ABS(y_err) > h_half) continue;    /*Too far*/
+                break;
+            case FIND_RIGHT:
+                x_err = get_x_center(child) - x_start;
+                y_err = get_y_center(child) - y_start;
+                if(x_err <= 0) continue;    /*It's on the left*/
+                if(LV_ABS(y_err) > h_half) continue;    /*Too far*/
+                break;
+            case FIND_TOP:
+                x_err = get_x_center(child) - x_start;
+                y_err = get_y_center(child) - y_start;
+                if(y_err >= 0) continue;    /*It's on the bottom*/
+                break;
+            case FIND_BOTTOM:
+                x_err = get_x_center(child) - x_start;
+                y_err = get_y_center(child) - y_start;
+                if(y_err <= 0) continue;    /*It's on the top*/
+                break;
+            case FIND_NEXT_ROW_FIRST_ITEM:
+                y_err = get_y_center(child) - y_start;
+                if(y_err <= 0) continue;    /*It's on the top*/
+                x_err = lv_obj_get_x(child);
+                break;
+            case FIND_PREV_ROW_LAST_ITEM:
+                y_err = get_y_center(child) - y_start;
+                if(y_err >= 0) continue;    /*It's on the bottom*/
+                x_err = obj->coords.x2 - child->coords.x2;
+                break;
+            case FIND_FIRST_ROW:
+                x_err = get_x_center(child) - x_start;
+                y_err = lv_obj_get_y(child);
+                break;
+            case FIND_LAST_ROW:
+                x_err = get_x_center(child) - x_start;
+                y_err = h_max - lv_obj_get_y(child);
+        }
+
+        if(guess == NULL ||
+           (y_err * y_err + x_err * x_err < y_err_guess * y_err_guess + x_err_guess * x_err_guess)) {
+            guess = child;
+            x_err_guess  = x_err;
+            y_err_guess  = y_err;
+        }
+    }
+    return guess;
+}
+
+static lv_obj_t * find_first_focusable(lv_obj_t * obj)
+{
+    uint32_t child_cnt = lv_obj_get_child_cnt(obj);
+    uint32_t i;
+    for(i = 0; i < child_cnt; i++) {
+        lv_obj_t * child = lv_obj_get_child(obj, i);
+        if(obj_is_focuable(child)) return child;
+
+    }
+    return NULL;
+}
+
+static lv_obj_t * find_last_focusable(lv_obj_t * obj)
+{
+    uint32_t child_cnt = lv_obj_get_child_cnt(obj);
+    int32_t i;
+    for(i = child_cnt - 1; i >= 0; i++) {
+        lv_obj_t * child = lv_obj_get_child(obj, i);
+        if(obj_is_focuable(child)) return child;
+    }
+    return NULL;
+}
+
+static bool obj_is_focuable(lv_obj_t * obj)
+{
+    if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return false;
+    if(lv_obj_has_flag(obj, LV_OBJ_FLAG_CLICKABLE | LV_OBJ_FLAG_CLICK_FOCUSABLE)) return true;
+    else return false;
+}
+
+static lv_coord_t get_x_center(lv_obj_t * obj)
+{
+    return obj->coords.x1 + lv_area_get_width(&obj->coords) / 2;
+}
+
+static lv_coord_t get_y_center(lv_obj_t * obj)
+{
+    return obj->coords.y1 + lv_area_get_height(&obj->coords) / 2;
+}
+
+#endif /*LV_USE_GRIDNAV*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/gridnav/lv_gridnav.h b/lib/libesp32_lvgl/lvgl/src/extra/others/gridnav/lv_gridnav.h
new file mode 100644
index 000000000..ea81595de
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/gridnav/lv_gridnav.h
@@ -0,0 +1,115 @@
+/**
+ * @file lv_templ.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/*This typedef exists purely to keep -Wpedantic happy when the file is empty.*/
+/*It can be removed.*/
+typedef int _keep_pedantic_happy;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+/**
+ * @file lv_gridnav.h
+ *
+ */
+
+#ifndef LV_GRIDFOCUS_H
+#define LV_GRIDFOCUS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../../core/lv_obj.h"
+
+#if LV_USE_GRIDNAV
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+typedef enum {
+    LV_GRIDNAV_CTRL_NONE = 0x0,
+
+    /**
+     * If there is no next/previous object in a direction,
+     * the focus goes to the object in the next/previous row (on left/right keys)
+     * or first/last row (on up/down keys)
+     */
+    LV_GRIDNAV_CTRL_ROLLOVER = 0x1,
+
+    /**
+     * If an arrow is pressed and the focused object can be scrolled in that direction
+     * then it will be scrolled instead of going to the next/previous object.
+     * If there is no more room for scrolling the next/previous object will be focused normally */
+    LV_GRIDNAV_CTRL_SCROLL_FIRST = 0x2,
+
+} lv_gridnav_ctrl_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Add grid navigation feature to an object. It expects the children to be arranged
+ * into a grid-like layout. Although it's not required to have pixel perfect alignment.
+ * This feature makes possible to use keys to navigate among the children and focus them.
+ * The keys other than arrows and press/release related events
+ * are forwarded to the focused child.
+ * @param obj       pointer to an object on which navigation should be applied.
+ * @param ctrl      control flags from `lv_gridnav_ctrl_t`.
+ */
+void lv_gridnav_add(lv_obj_t * obj, lv_gridnav_ctrl_t ctrl);
+
+/**
+ * Remove the grid navigation support from an object
+ * @param obj       pointer to an object
+ */
+void lv_gridnav_remove(lv_obj_t * obj);
+
+/**********************
+ *      MACROS
+ **********************/
+#endif /*LV_USE_GRIDNAV*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_GRIDFOCUS_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/lv_others.h b/lib/libesp32_lvgl/lvgl/src/extra/others/lv_others.h
index a95727146..a4338666a 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/others/lv_others.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/lv_others.h
@@ -14,6 +14,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "snapshot/lv_snapshot.h"
+#include "monkey/lv_monkey.h"
+#include "gridnav/lv_gridnav.h"
 
 /*********************
  *      DEFINES
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/monkey/lv_monkey.c b/lib/libesp32_lvgl/lvgl/src/extra/others/monkey/lv_monkey.c
new file mode 100755
index 000000000..6ec45e22b
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/monkey/lv_monkey.c
@@ -0,0 +1,187 @@
+/**
+ * @file lv_monkey.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_monkey.h"
+
+#if LV_USE_MONKEY != 0
+
+/*********************
+ *      DEFINES
+ *********************/
+#define MONKEY_PERIOD_RANGE_MIN_DEF    100
+#define MONKEY_PERIOD_RANGE_MAX_DEF    1000
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+typedef struct _lv_monkey {
+    lv_monkey_config_t config;
+    lv_indev_drv_t indev_drv;
+    lv_indev_data_t indev_data;
+    lv_indev_t * indev;
+    lv_timer_t * timer;
+#if LV_USE_USER_DATA
+    void * user_data;
+#endif
+} lv_monkey_t;
+
+static const lv_key_t lv_key_map[] = {
+    LV_KEY_UP,
+    LV_KEY_DOWN,
+    LV_KEY_RIGHT,
+    LV_KEY_LEFT,
+    LV_KEY_ESC,
+    LV_KEY_DEL,
+    LV_KEY_BACKSPACE,
+    LV_KEY_ENTER,
+    LV_KEY_NEXT,
+    LV_KEY_PREV,
+    LV_KEY_HOME,
+    LV_KEY_END,
+};
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+static void lv_monkey_read_cb(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
+static int32_t lv_monkey_random(int32_t howsmall, int32_t howbig);
+static void lv_monkey_timer_cb(lv_timer_t * timer);
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+void lv_monkey_config_init(lv_monkey_config_t * config)
+{
+    lv_memset_00(config, sizeof(lv_monkey_config_t));
+    config->type = LV_INDEV_TYPE_POINTER;
+    config->period_range.min = MONKEY_PERIOD_RANGE_MIN_DEF;
+    config->period_range.max = MONKEY_PERIOD_RANGE_MAX_DEF;
+}
+
+lv_monkey_t * lv_monkey_create(const lv_monkey_config_t * config)
+{
+    lv_monkey_t * monkey = lv_mem_alloc(sizeof(lv_monkey_t));
+    LV_ASSERT_MALLOC(monkey);
+
+    lv_memset_00(monkey, sizeof(lv_monkey_t));
+
+    monkey->config = *config;
+
+    lv_indev_drv_t * drv = &monkey->indev_drv;
+    lv_indev_drv_init(drv);
+    drv->type = config->type;
+    drv->read_cb = lv_monkey_read_cb;
+    drv->user_data = monkey;
+
+    monkey->timer = lv_timer_create(lv_monkey_timer_cb, monkey->config.period_range.min, monkey);
+    lv_timer_pause(monkey->timer);
+
+    monkey->indev = lv_indev_drv_register(drv);
+
+    return monkey;
+}
+
+lv_indev_t * lv_monkey_get_indev(lv_monkey_t * monkey)
+{
+    LV_ASSERT_NULL(monkey);
+    return monkey->indev;
+}
+
+void lv_monkey_set_enable(lv_monkey_t * monkey, bool en)
+{
+    LV_ASSERT_NULL(monkey);
+    en ? lv_timer_resume(monkey->timer) : lv_timer_pause(monkey->timer);
+}
+
+bool lv_monkey_get_enable(lv_monkey_t * monkey)
+{
+    LV_ASSERT_NULL(monkey);
+    return !monkey->timer->paused;
+}
+
+#if LV_USE_USER_DATA
+
+void lv_monkey_set_user_data(lv_monkey_t * monkey, void * user_data)
+{
+    LV_ASSERT_NULL(monkey);
+    monkey->user_data = user_data;
+}
+
+void * lv_monkey_get_user_data(lv_monkey_t * monkey)
+{
+    LV_ASSERT_NULL(monkey);
+    return monkey->user_data;
+}
+
+#endif
+
+void lv_monkey_del(lv_monkey_t * monkey)
+{
+    LV_ASSERT_NULL(monkey);
+
+    lv_timer_del(monkey->timer);
+    lv_indev_delete(monkey->indev);
+    lv_mem_free(monkey);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void lv_monkey_read_cb(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
+{
+    lv_monkey_t * monkey = indev_drv->user_data;
+
+    data->btn_id = monkey->indev_data.btn_id;
+    data->point = monkey->indev_data.point;
+    data->enc_diff = monkey->indev_data.enc_diff;
+    data->state = monkey->indev_data.state;
+}
+
+static int32_t lv_monkey_random(int32_t howsmall, int32_t howbig)
+{
+    if(howsmall >= howbig) {
+        return howsmall;
+    }
+    int32_t diff = howbig - howsmall;
+    return (int32_t)lv_rand(0, diff) + howsmall;
+}
+
+static void lv_monkey_timer_cb(lv_timer_t * timer)
+{
+    lv_monkey_t * monkey = timer->user_data;
+    lv_indev_data_t * data = &monkey->indev_data;
+
+    switch(monkey->indev_drv.type) {
+        case LV_INDEV_TYPE_POINTER:
+            data->point.x = (lv_coord_t)lv_monkey_random(0, LV_HOR_RES - 1);
+            data->point.y = (lv_coord_t)lv_monkey_random(0, LV_VER_RES - 1);
+            break;
+        case LV_INDEV_TYPE_ENCODER:
+            data->enc_diff = (int16_t)lv_monkey_random(monkey->config.input_range.min, monkey->config.input_range.max);
+            break;
+        case LV_INDEV_TYPE_BUTTON:
+            data->btn_id = (uint32_t)lv_monkey_random(monkey->config.input_range.min, monkey->config.input_range.max);
+            break;
+        case LV_INDEV_TYPE_KEYPAD: {
+                int32_t index = lv_monkey_random(0, sizeof(lv_key_map) / sizeof(lv_key_map[0]) - 1);
+                data->key = lv_key_map[index];
+                break;
+            }
+        default:
+            break;
+    }
+
+    data->state = lv_monkey_random(0, 100) < 50 ? LV_INDEV_STATE_RELEASED : LV_INDEV_STATE_PRESSED;
+
+    lv_timer_set_period(monkey->timer, lv_monkey_random(monkey->config.period_range.min, monkey->config.period_range.max));
+}
+
+#endif /*LV_USE_MONKEY*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/monkey/lv_monkey.h b/lib/libesp32_lvgl/lvgl/src/extra/others/monkey/lv_monkey.h
new file mode 100755
index 000000000..bf5e13c62
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/monkey/lv_monkey.h
@@ -0,0 +1,118 @@
+/**
+ * @file lv_monkey.h
+ *
+ */
+#ifndef LV_MONKEY_H
+#define LV_MONKEY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../../lvgl.h"
+
+#if LV_USE_MONKEY != 0
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+struct _lv_monkey;
+typedef struct _lv_monkey lv_monkey_t;
+
+typedef struct {
+    /**< Input device type*/
+    lv_indev_type_t type;
+
+    /**< Monkey execution period*/
+    struct {
+        uint32_t min;
+        uint32_t max;
+    } period_range;
+
+    /**< The range of input value*/
+    struct {
+        int32_t min;
+        int32_t max;
+    } input_range;
+} lv_monkey_config_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Initialize a monkey config with default values
+ * @param config pointer to 'lv_monkey_config_t' variable to initialize
+ */
+void lv_monkey_config_init(lv_monkey_config_t * config);
+
+/**
+ * Create monkey for test
+ * @param config pointer to 'lv_monkey_config_t' variable
+ * @return pointer to the created monkey
+ */
+lv_monkey_t * lv_monkey_create(const lv_monkey_config_t * config);
+
+/**
+ * Get monkey input device
+ * @param monkey pointer to a monkey
+ * @return pointer to the input device
+ */
+lv_indev_t * lv_monkey_get_indev(lv_monkey_t * monkey);
+
+/**
+ * Enable monkey
+ * @param monkey pointer to a monkey
+ * @param en set to true to enable
+ */
+void lv_monkey_set_enable(lv_monkey_t * monkey, bool en);
+
+/**
+ * Get whether monkey is enabled
+ * @param monkey pointer to a monkey
+ * @return return true if monkey enabled
+ */
+bool lv_monkey_get_enable(lv_monkey_t * monkey);
+
+#if LV_USE_USER_DATA
+
+/**
+ * Set the user_data field of the monkey
+ * @param monkey   pointer to a monkey
+ * @param user_data   pointer to the new user_data.
+ */
+void lv_monkey_set_user_data(lv_monkey_t * monkey, void * user_data);
+
+/**
+ * Get the user_data field of the monkey
+ * @param monkey pointer to a monkey
+ * @return the pointer to the user_data of the monkey
+ */
+void * lv_monkey_get_user_data(lv_monkey_t * monkey);
+
+#endif/*LV_USE_USER_DATA*/
+
+/**
+ * Delete monkey
+ * @param monkey pointer to monkey
+ */
+void lv_monkey_del(lv_monkey_t * monkey);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*LV_USE_MONKEY*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_MONKEY_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.c b/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.c
index 4575539c7..e9fa75109 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.c
@@ -105,69 +105,48 @@ lv_res_t lv_snapshot_take_to_buf(lv_obj_t * obj, lv_img_cf_t cf, lv_img_dsc_t *
     w += ext_size * 2;
     h += ext_size * 2;
 
-    /*Backup obj original info.*/
-    lv_obj_t * parent_old = lv_obj_get_parent(obj);
-    lv_area_t coords_bkp;
-    lv_area_copy(&coords_bkp, &obj->coords);
+    lv_area_t snapshot_area;
+    lv_obj_get_coords(obj, &snapshot_area);
+    lv_area_increase(&snapshot_area, ext_size, ext_size);
 
     lv_memset(buf, 0x00, buff_size);
     lv_memset_00(dsc, sizeof(lv_img_dsc_t));
 
-    /*We are safe to use stack for below variables since disp will be
-     * unregistered when function returns. */
-    lv_disp_t * disp;
+    lv_disp_t * obj_disp = lv_obj_get_disp(obj);
     lv_disp_drv_t driver;
-    lv_disp_draw_buf_t draw_buf;
-
-    lv_disp_draw_buf_init(&draw_buf, buf, NULL, w * h);
-
     lv_disp_drv_init(&driver);
-    driver.draw_buf = &draw_buf;
-    driver.hor_res = w;
-    driver.ver_res = h;
+    /*In lack of a better idea use the resolution of the object's display*/
+    driver.hor_res = lv_disp_get_hor_res(obj_disp);
+    driver.ver_res = lv_disp_get_hor_res(obj_disp);
     lv_disp_drv_use_generic_set_px_cb(&driver, cf);
 
-    disp = lv_disp_drv_register(&driver);
-    if(disp == NULL) {
-        return LV_RES_INV;
-    }
+    lv_disp_t fake_disp;
+    lv_memset_00(&fake_disp, sizeof(lv_disp_t));
+    fake_disp.driver = &driver;
 
-    /*Make background transparent */
-    lv_disp_set_bg_opa(disp, LV_OPA_TRANSP);
 
-    /*Move obj to newly created disp and refresh it. */
-    lv_obj_t * screen = lv_disp_get_scr_act(disp);
-    lv_obj_remove_style_all(screen);
-    lv_obj_allocate_spec_attr(screen);
-    screen->spec_attr->child_cnt = 1;
-    screen->spec_attr->children = &obj;
+    lv_draw_ctx_t * draw_ctx = lv_mem_alloc(obj_disp->driver->draw_ctx_size);
+    LV_ASSERT_MALLOC(draw_ctx);
+    if(draw_ctx == NULL) return LV_RES_INV;
+    obj_disp->driver->draw_ctx_init(fake_disp.driver, draw_ctx);
+    fake_disp.driver->draw_ctx = draw_ctx;
+    draw_ctx->clip_area = &snapshot_area;
+    draw_ctx->buf_area = &snapshot_area;
+    draw_ctx->buf = (void *)buf;
+    driver.draw_ctx = draw_ctx;
 
-    obj->parent = screen;
+    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
+    _lv_refr_set_disp_refreshing(&fake_disp);
 
-    disp->inv_p = 0;
+    lv_refr_obj(draw_ctx, obj);
 
-    obj->coords.x2 = w - ext_size - 1;
-    obj->coords.x1 = ext_size;
-    obj->coords.y2 = h - ext_size - 1;
-    obj->coords.y1 = ext_size;
-
-    lv_obj_invalidate(obj);
-
-    /*Don't call lv_refr_now to avoid animation disruption */
-    _lv_disp_refr_timer(disp->refr_timer);
-
-    /*Restore obj original parameters and clean up*/
-    obj->parent = parent_old;
-    screen->spec_attr->child_cnt = 0;
-    screen->spec_attr->children = NULL;
-
-    lv_disp_remove(disp);
-
-    lv_area_copy(&obj->coords, &coords_bkp);
+    _lv_refr_set_disp_refreshing(refr_ori);
+    obj_disp->driver->draw_ctx_deinit(fake_disp.driver, draw_ctx);
+    lv_mem_free(draw_ctx);
 
     dsc->data = buf;
-    dsc->header.w = lv_area_get_width(&draw_buf.area);
-    dsc->header.h = lv_area_get_height(&draw_buf.area);
+    dsc->header.w = w;
+    dsc->header.h = h;
     dsc->header.cf = cf;
     return LV_RES_OK;
 }
@@ -177,7 +156,7 @@ lv_res_t lv_snapshot_take_to_buf(lv_obj_t * obj, lv_img_cf_t cf, lv_img_dsc_t *
  * @param obj    The object to generate snapshot.
  * @param cf     color format for generated image.
  *
- * @return a pointer to a image descriptor, or NULL if failed.
+ * @return a pointer to an image descriptor, or NULL if failed.
  */
 lv_img_dsc_t * lv_snapshot_take(lv_obj_t * obj, lv_img_cf_t cf)
 {
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.h b/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.h
index b84973317..645192631 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/others/snapshot/lv_snapshot.h
@@ -37,7 +37,7 @@ extern "C" {
  * @param obj    The object to generate snapshot.
  * @param cf     color format for generated image.
  *
- * @return a pointer to a image descriptor, or NULL if failed.
+ * @return a pointer to an image descriptor, or NULL if failed.
  */
 lv_img_dsc_t * lv_snapshot_take(lv_obj_t * obj, lv_img_cf_t cf);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.h
index a61da3539..632949477 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.h
@@ -54,8 +54,7 @@ typedef uint8_t lv_animimg_part_t;
 
 /**
  * Create an animation image objects
- * @param par pointer to an object, it will be the parent of the new button
- * @param copy pointer to a image object, if not NULL then the new object will be copied from it
+ * @param parent pointer to an object, it will be the parent of the new button
  * @return pointer to the created animation image object
  */
 lv_obj_t * lv_animimg_create(lv_obj_t * parent);
@@ -65,7 +64,7 @@ lv_obj_t * lv_animimg_create(lv_obj_t * parent);
  *====================*/
 
 /**
- * Set the  image animation images source.
+ * Set the image animation images source.
  * @param img pointer to an animation image object
  * @param dsc pointer to a series images
  * @param num images' number
@@ -73,13 +72,13 @@ lv_obj_t * lv_animimg_create(lv_obj_t * parent);
 void lv_animimg_set_src(lv_obj_t * img,  lv_img_dsc_t * dsc[], uint8_t num);
 
 /**
- * Startup the  image animation.
- * @param img pointer to an animation image object
+ * Startup the image animation.
+ * @param obj pointer to an animation image object
  */
 void lv_animimg_start(lv_obj_t * obj);
 
 /**
- * Set the  image animation duration time. unit:ms
+ * Set the image animation duration time. unit:ms
  * @param img pointer to an animation image object
  */
 void lv_animimg_set_duration(lv_obj_t * img, uint32_t duration);
@@ -87,6 +86,7 @@ void lv_animimg_set_duration(lv_obj_t * img, uint32_t duration);
 /**
  * Set the image animation reapeatly play times.
  * @param img pointer to an animation image object
+ * @param count the number of times to repeat the animation
  */
 void lv_animimg_set_repeat_count(lv_obj_t * img, uint16_t count);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.c
index 3ba73ea30..f469eae5c 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.c
@@ -388,7 +388,8 @@ static void highlight_update(lv_obj_t * obj)
         for(i = 0; i < calendar->highlighted_dates_num; i++) {
             if(calendar->highlighted_dates[i].year == calendar->showed_date.year &&
                calendar->highlighted_dates[i].month == calendar->showed_date.month) {
-                lv_btnmatrix_set_btn_ctrl(calendar->btnm, calendar->highlighted_dates[i].day - 1 + day_first + 7, LV_CALENDAR_CTRL_HIGHLIGHT);
+                lv_btnmatrix_set_btn_ctrl(calendar->btnm, calendar->highlighted_dates[i].day - 1 + day_first + 7,
+                                          LV_CALENDAR_CTRL_HIGHLIGHT);
             }
         }
     }
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.h
index a91ce4b22..2511b2fac 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.h
@@ -82,7 +82,7 @@ void lv_calendar_set_today_date(lv_obj_t * obj, uint32_t year, uint32_t month, u
 void lv_calendar_set_showed_date(lv_obj_t * obj, uint32_t year, uint32_t month);
 
 /**
- * Set the the highlighted dates
+ * Set the highlighted dates
  * @param obj           pointer to a calendar object
  * @param highlighted   pointer to an `lv_calendar_date_t` array containing the dates.
  *                      Only the pointer will be saved so this variable can't be local which will be destroyed later.
@@ -126,7 +126,7 @@ const lv_calendar_date_t * lv_calendar_get_today_date(const lv_obj_t * calendar)
 const lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar);
 
 /**
- * Get the the highlighted dates
+ * Get the highlighted dates
  * @param calendar pointer to a calendar object
  * @return pointer to an `lv_calendar_date_t` array containing the dates.
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.h
index f33ef7dc8..609ccb0ca 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.h
@@ -46,4 +46,4 @@ lv_obj_t * lv_calendar_header_arrow_create(lv_obj_t * parent);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_CALENDAR_H*/
+#endif /*LV_CALENDAR_HEADER_ARROW_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
index 7ce924e94..fca219768 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
@@ -46,4 +46,4 @@ lv_obj_t * lv_calendar_header_dropdown_create(lv_obj_t * parent);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_CALENDAR_H*/
+#endif /*LV_CALENDAR_HEADER_DROPDOWN_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.c
index 12c05b338..a6e09fb45 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.c
@@ -32,12 +32,12 @@ static void lv_chart_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
 static void lv_chart_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_chart_event(const lv_obj_class_t * class_p, lv_event_t * e);
 
-static void draw_div_lines(lv_obj_t * obj, const lv_area_t * mask);
-static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area);
-static void draw_series_bar(lv_obj_t * obj, const lv_area_t * clip_area);
-static void draw_series_scatter(lv_obj_t * obj, const lv_area_t * clip_area);
-static void draw_cursors(lv_obj_t * obj, const lv_area_t * clip_area);
-static void draw_axes(lv_obj_t * obj, const lv_area_t * mask);
+static void draw_div_lines(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
+static void draw_series_line(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
+static void draw_series_bar(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
+static void draw_series_scatter(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
+static void draw_cursors(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
+static void draw_axes(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
 static uint32_t get_index_from_x(lv_obj_t * obj, lv_coord_t x);
 static void invalidate_point(lv_obj_t * obj, uint16_t i);
 static void new_points_alloc(lv_obj_t * obj, lv_chart_series_t * ser, uint32_t cnt, lv_coord_t ** a);
@@ -539,6 +539,7 @@ void lv_chart_set_next_value(lv_obj_t * obj, lv_chart_series_t * ser, lv_coord_t
     invalidate_point(obj, ser->start_point);
     ser->start_point = (ser->start_point + 1) % chart->point_cnt;
     invalidate_point(obj, ser->start_point);
+    lv_chart_refresh(obj);
 }
 
 void lv_chart_set_next_value2(lv_obj_t * obj, lv_chart_series_t * ser, lv_coord_t x_value, lv_coord_t y_value)
@@ -570,6 +571,7 @@ void lv_chart_set_value_by_id(lv_obj_t * obj, lv_chart_series_t * ser, uint16_t
 
     if(id >= chart->point_cnt) return;
     ser->y_points[id] = value;
+    lv_chart_refresh(obj);
 }
 
 void lv_chart_set_value_by_id2(lv_obj_t * obj, lv_chart_series_t * ser, uint16_t id, lv_coord_t x_value,
@@ -587,6 +589,7 @@ void lv_chart_set_value_by_id2(lv_obj_t * obj, lv_chart_series_t * ser, uint16_t
     if(id >= chart->point_cnt) return;
     ser->x_points[id] = x_value;
     ser->y_points[id] = y_value;
+    lv_chart_refresh(obj);
 }
 
 void lv_chart_set_ext_y_array(lv_obj_t * obj, lv_chart_series_t * ser, lv_coord_t array[])
@@ -685,6 +688,14 @@ static void lv_chart_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
     }
     _lv_ll_clear(&chart->series_ll);
 
+    lv_chart_cursor_t * cur;
+    while(chart->cursor_ll.head) {
+        cur = _lv_ll_get_head(&chart->cursor_ll);
+        _lv_ll_remove(&chart->cursor_ll, cur);
+        lv_mem_free(cur);
+    }
+    _lv_ll_clear(&chart->cursor_ll);
+
     LV_TRACE_OBJ_CREATE("finished");
 }
 
@@ -733,28 +744,31 @@ static void lv_chart_event(const lv_obj_class_t * class_p, lv_event_t * e)
         p->y = ((int32_t)lv_obj_get_content_height(obj) * chart->zoom_y) >> 8;
     }
     else if(code == LV_EVENT_DRAW_MAIN) {
-        const lv_area_t * clip_area = lv_event_get_param(e);
-        draw_div_lines(obj, clip_area);
-        draw_axes(obj, clip_area);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
+        draw_div_lines(obj, draw_ctx);
+        draw_axes(obj, draw_ctx);
 
         if(_lv_ll_is_empty(&chart->series_ll) == false) {
-            if(chart->type == LV_CHART_TYPE_LINE) draw_series_line(obj, clip_area);
-            else if(chart->type == LV_CHART_TYPE_BAR) draw_series_bar(obj, clip_area);
-            else if(chart->type == LV_CHART_TYPE_SCATTER) draw_series_scatter(obj, clip_area);
+            if(chart->type == LV_CHART_TYPE_LINE) draw_series_line(obj, draw_ctx);
+            else if(chart->type == LV_CHART_TYPE_BAR) draw_series_bar(obj, draw_ctx);
+            else if(chart->type == LV_CHART_TYPE_SCATTER) draw_series_scatter(obj, draw_ctx);
         }
 
-        draw_cursors(obj, clip_area);
+        draw_cursors(obj, draw_ctx);
     }
 }
 
-static void draw_div_lines(lv_obj_t * obj, const lv_area_t * clip_area)
+static void draw_div_lines(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
     lv_chart_t * chart  = (lv_chart_t *)obj;
 
-    lv_area_t series_mask;
-    bool mask_ret = _lv_area_intersect(&series_mask, &obj->coords, clip_area);
+    lv_area_t series_clip_area;
+    bool mask_ret = _lv_area_intersect(&series_clip_area, &obj->coords, draw_ctx->clip_area);
     if(mask_ret == false) return;
 
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &series_clip_area;
+
     int16_t i;
     int16_t i_start;
     int16_t i_end;
@@ -771,7 +785,7 @@ static void draw_div_lines(lv_obj_t * obj, const lv_area_t * clip_area)
     lv_obj_init_draw_line_dsc(obj, LV_PART_MAIN, &line_dsc);
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.part = LV_PART_MAIN;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_CHART_DRAW_PART_DIV_LINE_INIT;
@@ -811,7 +825,7 @@ static void draw_div_lines(lv_obj_t * obj, const lv_area_t * clip_area)
             part_draw_dsc.id = i;
 
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-            lv_draw_line(&p1, &p2, &series_mask, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
         }
     }
@@ -839,7 +853,7 @@ static void draw_div_lines(lv_obj_t * obj, const lv_area_t * clip_area)
             part_draw_dsc.id = i;
 
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-            lv_draw_line(&p1, &p2, &series_mask, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
         }
     }
@@ -849,12 +863,16 @@ static void draw_div_lines(lv_obj_t * obj, const lv_area_t * clip_area)
     part_draw_dsc.p2 = NULL;
     lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
 
+    draw_ctx->clip_area = clip_area_ori;
 }
 
-static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
+static void draw_series_line(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
-    lv_area_t com_area;
-    if(_lv_area_intersect(&com_area, &obj->coords, clip_area) == false) return;
+    lv_area_t clip_area;
+    if(_lv_area_intersect(&clip_area, &obj->coords, draw_ctx->clip_area) == false) return;
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
 
     lv_chart_t * chart  = (lv_chart_t *)obj;
     if(chart->point_cnt < 2) return;
@@ -871,8 +889,8 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
     lv_coord_t y_ofs = obj->coords.y1 + pad_top - lv_obj_get_scroll_top(obj);
     lv_chart_series_t * ser;
 
-    lv_area_t series_mask;
-    bool mask_ret = _lv_area_intersect(&series_mask, &obj->coords, clip_area);
+    lv_area_t series_clip_area;
+    bool mask_ret = _lv_area_intersect(&series_clip_area, &obj->coords, draw_ctx->clip_area);
     if(mask_ret == false) return;
 
     lv_draw_line_dsc_t line_dsc_default;
@@ -911,7 +929,7 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
         p2.y   = h - y_tmp + y_ofs;
 
         lv_obj_draw_part_dsc_t part_draw_dsc;
-        lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+        lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
         part_draw_dsc.class_p = MY_CLASS;
         part_draw_dsc.type = LV_CHART_DRAW_PART_LINE_AND_POINT;
         part_draw_dsc.part = LV_PART_ITEMS;
@@ -926,7 +944,7 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
             p1.x = p2.x;
             p1.y = p2.y;
 
-            if(p1.x > clip_area->x2 + point_w + 1) break;
+            if(p1.x > clip_area_ori->x2 + point_w + 1) break;
             p2.x = ((w * i) / (chart->point_cnt - 1)) + x_ofs;
 
             p_act = (start_point + i) % chart->point_cnt;
@@ -935,7 +953,7 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
             y_tmp = y_tmp / (chart->ymax[ser->y_axis_sec] - chart->ymin[ser->y_axis_sec]);
             p2.y  = h - y_tmp + y_ofs;
 
-            if(p2.x < clip_area->x1 - point_w - 1) {
+            if(p2.x < clip_area_ori->x1 - point_w - 1) {
                 p_prev = p_act;
                 continue;
             }
@@ -954,7 +972,7 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
                             p1.y = y_min;
                             p2.y = y_max;
                             if(p1.y == p2.y) p2.y++;    /*If they are the same no line will be drawn*/
-                            lv_draw_line(&p1, &p2, &series_mask, &line_dsc_default);
+                            lv_draw_line(draw_ctx, &line_dsc_default, &p1, &p2);
                             p2.x++;         /*Compensate the previous x--*/
                             y_min = y_cur;  /*Start the line of the next x from the current last y*/
                             y_max = y_cur;
@@ -977,11 +995,11 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
                     lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
                     if(ser->y_points[p_prev] != LV_CHART_POINT_NONE && ser->y_points[p_act] != LV_CHART_POINT_NONE) {
-                        lv_draw_line(&p1, &p2, &series_mask, &line_dsc_default);
+                        lv_draw_line(draw_ctx, &line_dsc_default, &p1, &p2);
                     }
 
                     if(point_w && point_h && ser->y_points[p_prev] != LV_CHART_POINT_NONE) {
-                        lv_draw_rect(&point_area, &series_mask, &point_dsc_default);
+                        lv_draw_rect(draw_ctx, &point_dsc_default, &point_area);
                     }
 
                     lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
@@ -1006,19 +1024,25 @@ static void draw_series_line(lv_obj_t * obj, const lv_area_t * clip_area)
                 part_draw_dsc.p2 = NULL;
                 part_draw_dsc.draw_area = &point_area;
                 part_draw_dsc.value = ser->y_points[p_act];
+
                 lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-                lv_draw_rect(&point_area, &series_mask, &point_dsc_default);
+                lv_draw_rect(draw_ctx, &point_dsc_default, &point_area);
                 lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
             }
         }
     }
+
+    draw_ctx->clip_area = clip_area_ori;
 }
 
-static void draw_series_scatter(lv_obj_t * obj, const lv_area_t * clip_area)
+static void draw_series_scatter(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
 
-    lv_area_t com_area;
-    if(_lv_area_intersect(&com_area, &obj->coords, clip_area) == false) return;
+    lv_area_t clip_area;
+    if(_lv_area_intersect(&clip_area, &obj->coords, draw_ctx->clip_area) == false) return;
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
 
     lv_chart_t * chart  = (lv_chart_t *)obj;
 
@@ -1034,10 +1058,6 @@ static void draw_series_scatter(lv_obj_t * obj, const lv_area_t * clip_area)
     lv_coord_t y_ofs = obj->coords.y1 + pad_top + border_width - lv_obj_get_scroll_top(obj);
     lv_chart_series_t * ser;
 
-    lv_area_t series_mask;
-    bool mask_ret = _lv_area_intersect(&series_mask, &obj->coords, clip_area);
-    if(mask_ret == false) return;
-
     lv_draw_line_dsc_t line_dsc_default;
     lv_draw_line_dsc_init(&line_dsc_default);
     lv_obj_init_draw_line_dsc(obj, LV_PART_ITEMS, &line_dsc_default);
@@ -1080,7 +1100,7 @@ static void draw_series_scatter(lv_obj_t * obj, const lv_area_t * clip_area)
         }
 
         lv_obj_draw_part_dsc_t part_draw_dsc;
-        lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+        lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
         part_draw_dsc.part = LV_PART_ITEMS;
         part_draw_dsc.class_p = MY_CLASS;
         part_draw_dsc.type = LV_CHART_DRAW_PART_LINE_AND_POINT;
@@ -1123,9 +1143,9 @@ static void draw_series_scatter(lv_obj_t * obj, const lv_area_t * clip_area)
                 lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
                 if(ser->y_points[p_prev] != LV_CHART_POINT_NONE && ser->y_points[p_act] != LV_CHART_POINT_NONE) {
-                    lv_draw_line(&p1, &p2, &series_mask, &line_dsc_default);
+                    lv_draw_line(draw_ctx, &line_dsc_default, &p1, &p2);
                     if(point_w && point_h) {
-                        lv_draw_rect(&point_area, &series_mask, &point_dsc_default);
+                        lv_draw_rect(draw_ctx, &point_dsc_default, &point_area);
                     }
                 }
 
@@ -1150,17 +1170,22 @@ static void draw_series_scatter(lv_obj_t * obj, const lv_area_t * clip_area)
                 part_draw_dsc.draw_area = &point_area;
                 part_draw_dsc.value = ser->y_points[p_act];
                 lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-                lv_draw_rect(&point_area, &series_mask, &point_dsc_default);
+                lv_draw_rect(draw_ctx, &point_dsc_default, &point_area);
                 lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
             }
         }
     }
+    draw_ctx->clip_area = clip_area_ori;
 }
 
-static void draw_series_bar(lv_obj_t * obj, const lv_area_t * clip_area)
+static void draw_series_bar(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
-    lv_area_t com_area;
-    if(_lv_area_intersect(&com_area, &obj->coords, clip_area) == false) return;
+    lv_area_t clip_area;
+    if(_lv_area_intersect(&clip_area, &obj->coords, draw_ctx->clip_area) == false) return;
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
+
 
     lv_chart_t * chart  = (lv_chart_t *)obj;
 
@@ -1185,18 +1210,14 @@ static void draw_series_bar(lv_obj_t * obj, const lv_area_t * clip_area)
     lv_draw_rect_dsc_t col_dsc;
     lv_draw_rect_dsc_init(&col_dsc);
     lv_obj_init_draw_rect_dsc(obj, LV_PART_ITEMS, &col_dsc);
-    col_dsc.bg_grad_dir = LV_GRAD_DIR_NONE;
+    col_dsc.bg_grad.dir = LV_GRAD_DIR_NONE;
     col_dsc.bg_opa = LV_OPA_COVER;
 
     /*Make the cols longer with `radius` to clip the rounding from the bottom*/
     col_a.y2 = obj->coords.y2 + col_dsc.radius;
 
-    lv_area_t series_mask;
-    bool mask_ret = _lv_area_intersect(&series_mask, &obj->coords, clip_area);
-    if(mask_ret == false) return;
-
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, &series_mask);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.part = LV_PART_ITEMS;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_CHART_DRAW_PART_BAR;
@@ -1216,8 +1237,8 @@ static void draw_series_bar(lv_obj_t * obj, const lv_area_t * clip_area)
             col_a.x2 = col_a.x1 + col_w - ser_gap - 1;
             x_act += col_w;
 
-            if(col_a.x2 < series_mask.x1) continue;
-            if(col_a.x1 > series_mask.x2) break;
+            if(col_a.x2 < clip_area.x1) continue;
+            if(col_a.x1 > clip_area.x2) break;
 
             col_dsc.bg_color = ser->color;
 
@@ -1232,20 +1253,27 @@ static void draw_series_bar(lv_obj_t * obj, const lv_area_t * clip_area)
                 part_draw_dsc.sub_part_ptr = ser;
                 part_draw_dsc.value = ser->y_points[p_act];
                 lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-                lv_draw_rect(&col_a, &series_mask, &col_dsc);
+                lv_draw_rect(draw_ctx, &col_dsc, &col_a);
                 lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
             }
         }
     }
+    draw_ctx->clip_area = clip_area_ori;
 }
 
-static void draw_cursors(lv_obj_t * obj, const lv_area_t * clip_area)
+static void draw_cursors(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
 
     lv_chart_t * chart  = (lv_chart_t *)obj;
     if(_lv_ll_is_empty(&chart->cursor_ll)) return;
 
+    lv_area_t clip_area;
+    if(!_lv_area_intersect(&clip_area, draw_ctx->clip_area, &obj->coords)) return;
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
+
     lv_point_t p1;
     lv_point_t p2;
     lv_chart_cursor_t * cursor;
@@ -1266,16 +1294,13 @@ static void draw_cursors(lv_obj_t * obj, const lv_area_t * clip_area)
     lv_coord_t point_h = lv_obj_get_style_width(obj, LV_PART_CURSOR) / 2;
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.line_dsc = &line_dsc_tmp;
     part_draw_dsc.rect_dsc = &point_dsc_tmp;
     part_draw_dsc.part = LV_PART_CURSOR;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_CHART_DRAW_PART_CURSOR;
 
-    lv_area_t clip_area2;
-    _lv_area_intersect(&clip_area2, clip_area, &obj->coords);
-
     /*Go through all cursor lines*/
     _LV_LL_READ_BACK(&chart->cursor_ll, cursor) {
         lv_memcpy(&line_dsc_tmp, &line_dsc_ori, sizeof(lv_draw_line_dsc_t));
@@ -1323,8 +1348,8 @@ static void draw_cursors(lv_obj_t * obj, const lv_area_t * clip_area)
             p2.y = p1.y;
 
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-            lv_draw_line(&p1, &p2, &clip_area2, &line_dsc_tmp);
-            lv_draw_rect(&point_area, &clip_area2, &point_dsc_tmp);
+            lv_draw_line(draw_ctx, &line_dsc_tmp, &p1, &p2);
+            lv_draw_rect(draw_ctx, &point_dsc_tmp, &point_area);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
         }
 
@@ -1335,15 +1360,16 @@ static void draw_cursors(lv_obj_t * obj, const lv_area_t * clip_area)
             p2.y = cursor->dir & LV_DIR_BOTTOM ? obj->coords.y2 : cy;
 
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-            lv_draw_line(&p1, &p2, &clip_area2, &line_dsc_tmp);
-            lv_draw_rect(&point_area, &clip_area2, &point_dsc_tmp);
+            lv_draw_line(draw_ctx, &line_dsc_tmp, &p1, &p2);
+            lv_draw_rect(draw_ctx, &point_dsc_tmp, &point_area);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
         }
-
     }
+
+    draw_ctx->clip_area = clip_area_ori;
 }
 
-static void draw_y_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_axis_t axis)
+static void draw_y_ticks(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, lv_chart_axis_t axis)
 {
     lv_chart_t * chart  = (lv_chart_t *)obj;
 
@@ -1392,7 +1418,7 @@ static void draw_y_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
     lv_obj_init_draw_label_dsc(obj, LV_PART_TICKS, &label_dsc);
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_CHART_DRAW_PART_TICK_LABEL;
     part_draw_dsc.id = axis;
@@ -1455,7 +1481,7 @@ static void draw_y_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
 
             if(a.y2 >= obj->coords.y1 &&
                a.y1  <= obj->coords.y2) {
-                lv_draw_label(&a, clip_area, &label_dsc, part_draw_dsc.text, NULL);
+                lv_draw_label(draw_ctx, &label_dsc, &a, part_draw_dsc.text, NULL);
             }
         }
         else {
@@ -1467,14 +1493,14 @@ static void draw_y_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
 
         if(p1.y + line_dsc.width / 2  >= obj->coords.y1 &&
            p2.y - line_dsc.width / 2  <= obj->coords.y2) {
-            lv_draw_line(&p1, &p2, clip_area, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
         }
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
 }
 
-static void draw_x_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_axis_t axis)
+static void draw_x_ticks(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, lv_chart_axis_t axis)
 {
     lv_chart_t * chart  = (lv_chart_t *)obj;
 
@@ -1507,8 +1533,8 @@ static void draw_x_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
     }
 
     if(axis == LV_CHART_AXIS_PRIMARY_X) {
-        if(y_ofs > clip_area->y2) return;
-        if(y_ofs + label_gap  + label_dsc.font->line_height + t->major_len < clip_area->y1) return;
+        if(y_ofs > draw_ctx->clip_area->y2) return;
+        if(y_ofs + label_gap  + label_dsc.font->line_height + t->major_len < draw_ctx->clip_area->y1) return;
     }
 
     lv_draw_line_dsc_t line_dsc;
@@ -1518,7 +1544,7 @@ static void draw_x_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
     line_dsc.dash_width = 0;
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_CHART_DRAW_PART_TICK_LABEL;
     part_draw_dsc.id = LV_CHART_AXIS_PRIMARY_X;
@@ -1591,7 +1617,7 @@ static void draw_x_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
 
             if(a.x2 >= obj->coords.x1 &&
                a.x1 <= obj->coords.x2) {
-                lv_draw_label(&a, clip_area, &label_dsc, part_draw_dsc.text, NULL);
+                lv_draw_label(draw_ctx, &label_dsc, &a, part_draw_dsc.text, NULL);
             }
         }
         else {
@@ -1604,19 +1630,19 @@ static void draw_x_ticks(lv_obj_t * obj, const lv_area_t * clip_area, lv_chart_a
 
         if(p1.x + line_dsc.width / 2  >= obj->coords.x1 &&
            p2.x - line_dsc.width / 2  <= obj->coords.x2) {
-            lv_draw_line(&p1, &p2, clip_area, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
         }
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
 }
 
-static void draw_axes(lv_obj_t * obj, const lv_area_t * mask)
+static void draw_axes(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
-    draw_y_ticks(obj, mask, LV_CHART_AXIS_PRIMARY_Y);
-    draw_y_ticks(obj, mask, LV_CHART_AXIS_SECONDARY_Y);
-    draw_x_ticks(obj, mask, LV_CHART_AXIS_PRIMARY_X);
-    draw_x_ticks(obj, mask, LV_CHART_AXIS_SECONDARY_X);
+    draw_y_ticks(obj, draw_ctx, LV_CHART_AXIS_PRIMARY_Y);
+    draw_y_ticks(obj, draw_ctx, LV_CHART_AXIS_SECONDARY_Y);
+    draw_x_ticks(obj, draw_ctx, LV_CHART_AXIS_PRIMARY_X);
+    draw_x_ticks(obj, draw_ctx, LV_CHART_AXIS_SECONDARY_X);
 }
 
 /**
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.h
index 364c58d2d..8a9b8cfc0 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.h
@@ -135,7 +135,7 @@ typedef enum {
  **********************/
 
 /**
- * Create a chart objects
+ * Create a chart object
  * @param parent    pointer to an object, it will be the parent of the new chart
  * @return          pointer to the created chart
  */
@@ -330,7 +330,7 @@ lv_chart_cursor_t  * lv_chart_add_cursor(lv_obj_t * obj, lv_color_t color, lv_di
  * Set the coordinate of the cursor with respect to the paddings
  * @param obj       pointer to a chart object
  * @param cursor    pointer to the cursor
- * @param pos       the new coordinate of cursor relative the the chart
+ * @param pos       the new coordinate of cursor relative to the chart
  */
 void lv_chart_set_cursor_pos(lv_obj_t * chart, lv_chart_cursor_t * cursor, lv_point_t * pos);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.c
index 633ede7d1..3fb7128cf 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.c
@@ -71,7 +71,7 @@ static bool create_knob_recolor;
 
 /**
  * Create a color_picker object
- * @param par pointer to an object, it will be the parent of the new color_picker
+ * @param parent pointer to an object, it will be the parent of the new color_picker
  * @return pointer to the created color_picker
  */
 lv_obj_t * lv_colorwheel_create(lv_obj_t * parent, bool knob_recolor)
@@ -242,7 +242,7 @@ static void lv_colorwheel_constructor(const lv_obj_class_t * class_p, lv_obj_t *
 static void draw_disc_grad(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     lv_coord_t w = lv_obj_get_width(obj);
     lv_coord_t h = lv_obj_get_height(obj);
     lv_coord_t cx = obj->coords.x1 + w / 2;
@@ -292,7 +292,7 @@ static void draw_disc_grad(lv_event_t * e)
         p[1].x = cx + ((r - cir_w - cir_w_extra) * lv_trigo_sin(angle_trigo) >> LV_TRIGO_SHIFT);
         p[1].y = cy + ((r - cir_w - cir_w_extra) * lv_trigo_cos(angle_trigo) >> LV_TRIGO_SHIFT);
 
-        lv_draw_line(&p[0], &p[1], clip_area, &line_dsc);
+        lv_draw_line(draw_ctx, &line_dsc, &p[0], &p[1]);
     }
 
 #if LV_DRAW_COMPLEX
@@ -306,7 +306,7 @@ static void draw_disc_grad(lv_event_t * e)
 static void draw_knob(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj;
 
     lv_draw_rect_dsc_t cir_dsc;
@@ -321,7 +321,7 @@ static void draw_knob(lv_event_t * e)
 
     lv_area_t knob_area = get_knob_area(obj);
 
-    lv_draw_rect(&knob_area, clip_area, &cir_dsc);
+    lv_draw_rect(draw_ctx, &cir_dsc, &knob_area);
 }
 
 static void invalidate_knob(lv_obj_t * obj)
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h
index b257af93d..e9c9d92ee 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h
@@ -55,7 +55,7 @@ extern const lv_obj_class_t lv_colorwheel_class;
  **********************/
 
 /**
- * Create a color picker objects with disc shape
+ * Create a color picker object with disc shape
  * @param parent pointer to an object, it will be the parent of the new color picker
  * @param knob_recolor true: set the knob's color to the current color
  * @return pointer to the created color picker
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.c
index 964801f7c..00c3011ca 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.c
@@ -49,8 +49,8 @@ const lv_obj_class_t lv_imgbtn_class = {
  **********************/
 
 /**
- * Create a image button object
- * @param par pointer to an object, it will be the parent of the new image button
+ * Create an image button object
+ * @param parent pointer to an object, it will be the parent of the new image button
  * @return pointer to the created image button
  */
 lv_obj_t * lv_imgbtn_create(lv_obj_t * parent)
@@ -67,7 +67,7 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * parent)
 
 /**
  * Set images for a state of the image button
- * @param imgbtn pointer to an image button object
+ * @param obj pointer to an image button object
  * @param state for which state set the new image
  * @param src_left pointer to an image source for the left side of the button (a C array or path to
  * a file)
@@ -92,19 +92,20 @@ void lv_imgbtn_set_src(lv_obj_t * obj, lv_imgbtn_state_t state, const void * src
 
 void lv_imgbtn_set_state(lv_obj_t * obj, lv_imgbtn_state_t state)
 {
-	LV_ASSERT_OBJ(obj, MY_CLASS);
+    LV_ASSERT_OBJ(obj, MY_CLASS);
 
-	lv_state_t obj_state = LV_STATE_DEFAULT;
-	if(state == LV_IMGBTN_STATE_PRESSED || state == LV_IMGBTN_STATE_CHECKED_PRESSED) obj_state |= LV_STATE_PRESSED;
-	if(state == LV_IMGBTN_STATE_DISABLED || state == LV_IMGBTN_STATE_CHECKED_DISABLED) obj_state |= LV_STATE_DISABLED;
-	if(state == LV_IMGBTN_STATE_CHECKED_DISABLED || state == LV_IMGBTN_STATE_CHECKED_PRESSED || state == LV_IMGBTN_STATE_CHECKED_RELEASED) {
-		obj_state |= LV_STATE_CHECKED;
-	}
+    lv_state_t obj_state = LV_STATE_DEFAULT;
+    if(state == LV_IMGBTN_STATE_PRESSED || state == LV_IMGBTN_STATE_CHECKED_PRESSED) obj_state |= LV_STATE_PRESSED;
+    if(state == LV_IMGBTN_STATE_DISABLED || state == LV_IMGBTN_STATE_CHECKED_DISABLED) obj_state |= LV_STATE_DISABLED;
+    if(state == LV_IMGBTN_STATE_CHECKED_DISABLED || state == LV_IMGBTN_STATE_CHECKED_PRESSED ||
+       state == LV_IMGBTN_STATE_CHECKED_RELEASED) {
+        obj_state |= LV_STATE_CHECKED;
+    }
 
-	lv_obj_clear_state(obj, LV_STATE_CHECKED | LV_STATE_PRESSED | LV_STATE_DISABLED);
-	lv_obj_add_state(obj, obj_state);
+    lv_obj_clear_state(obj, LV_STATE_CHECKED | LV_STATE_PRESSED | LV_STATE_DISABLED);
+    lv_obj_add_state(obj, obj_state);
 
-	refr_img(obj);
+    refr_img(obj);
 }
 
 /*=====================
@@ -114,7 +115,7 @@ void lv_imgbtn_set_state(lv_obj_t * obj, lv_imgbtn_state_t state)
 
 /**
  * Get the left image in a given state
- * @param imgbtn pointer to an image button object
+ * @param obj pointer to an image button object
  * @param state the state where to get the image (from `lv_btn_state_t`) `
  * @return pointer to the left image source (a C array or path to a file)
  */
@@ -129,7 +130,7 @@ const void * lv_imgbtn_get_src_left(lv_obj_t * obj, lv_imgbtn_state_t state)
 
 /**
  * Get the middle image in a given state
- * @param imgbtn pointer to an image button object
+ * @param obj pointer to an image button object
  * @param state the state where to get the image (from `lv_btn_state_t`) `
  * @return pointer to the middle image source (a C array or path to a file)
  */
@@ -143,7 +144,7 @@ const void * lv_imgbtn_get_src_middle(lv_obj_t * obj, lv_imgbtn_state_t state)
 
 /**
  * Get the right image in a given state
- * @param imgbtn pointer to an image button object
+ * @param obj pointer to an image button object
  * @param state the state where to get the image (from `lv_btn_state_t`) `
  * @return pointer to the left image source (a C array or path to a file)
  */
@@ -210,7 +211,7 @@ static void draw_main(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
     /*Just draw_main an image*/
     lv_imgbtn_state_t state  = suggest_state(obj, get_state(obj));
@@ -243,7 +244,7 @@ static void draw_main(lv_event_t * e)
         coords_part.y1 = coords.y1;
         coords_part.x2 = coords.x1 + header.w - 1;
         coords_part.y2 = coords.y1 + header.h - 1;
-        lv_draw_img(&coords_part, clip_area, src, &img_dsc);
+        lv_draw_img(draw_ctx, &img_dsc, &coords_part, src);
     }
 
     src = imgbtn->img_src_right[state];
@@ -254,33 +255,38 @@ static void draw_main(lv_event_t * e)
         coords_part.y1 = coords.y1;
         coords_part.x2 = coords.x2;
         coords_part.y2 = coords.y1 + header.h - 1;
-        lv_draw_img(&coords_part, clip_area, src, &img_dsc);
+        lv_draw_img(draw_ctx, &img_dsc, &coords_part, src);
     }
 
     src = imgbtn->img_src_mid[state];
     if(src) {
-        lv_area_t clip_center_area;
-        clip_center_area.x1 = coords.x1 + left_w;
-        clip_center_area.x2 = coords.x2 - right_w;
-        clip_center_area.y1 = coords.y1;
-        clip_center_area.y2 = coords.y2;
+        lv_area_t clip_area_center;
+        clip_area_center.x1 = coords.x1 + left_w;
+        clip_area_center.x2 = coords.x2 - right_w;
+        clip_area_center.y1 = coords.y1;
+        clip_area_center.y2 = coords.y2;
+
 
         bool comm_res;
-        comm_res = _lv_area_intersect(&clip_center_area, &clip_center_area, clip_area);
+        comm_res = _lv_area_intersect(&clip_area_center, &clip_area_center, draw_ctx->clip_area);
         if(comm_res) {
             lv_coord_t i;
             lv_img_decoder_get_info(src, &header);
 
+            const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+            draw_ctx->clip_area = &clip_area_center;
+
             coords_part.x1 = coords.x1 + left_w;
             coords_part.y1 = coords.y1;
             coords_part.x2 = coords_part.x1 + header.w - 1;
             coords_part.y2 = coords_part.y1 + header.h - 1;
 
-            for(i = coords_part.x1; i < (lv_coord_t)(clip_center_area.x2 + header.w - 1); i += header.w) {
-                lv_draw_img(&coords_part, &clip_center_area, src, &img_dsc);
+            for(i = coords_part.x1; i < (lv_coord_t)(clip_area_center.x2 + header.w - 1); i += header.w) {
+                lv_draw_img(draw_ctx, &img_dsc, &coords_part, src);
                 coords_part.x1 = coords_part.x2 + 1;
                 coords_part.x2 += header.w;
             }
+            draw_ctx->clip_area = clip_area_ori;
         }
     }
 }
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h
index b8e2c8a2a..597faea18 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h
@@ -49,8 +49,8 @@ extern const lv_obj_class_t lv_imgbtn_class;
  **********************/
 
 /**
- * Create a image button objects
- * @param par pointer to an object, it will be the parent of the new image button
+ * Create an image button object
+ * @param parent pointer to an object, it will be the parent of the new image button
  * @return pointer to the created image button
  */
 lv_obj_t * lv_imgbtn_create(lv_obj_t * parent);
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.c
index 09cb0c875..6ba431eb9 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.c
@@ -130,8 +130,8 @@ static const lv_btnmatrix_ctrl_t * kb_ctrl[9] = {
  **********************/
 
 /**
- * Create a keyboard objects
- * @param par pointer to an object, it will be the parent of the new keyboard
+ * Create a Keyboard object
+ * @param parent pointer to an object, it will be the parent of the new keyboard
  * @return pointer to the created keyboard
  */
 lv_obj_t * lv_keyboard_create(lv_obj_t * parent)
@@ -197,7 +197,7 @@ void lv_keyboard_set_popovers(lv_obj_t * obj, bool en)
 {
     lv_keyboard_t * keyboard = (lv_keyboard_t *)obj;
 
-    if (keyboard->popovers == en) {
+    if(keyboard->popovers == en) {
         return;
     }
 
@@ -406,10 +406,11 @@ static void lv_keyboard_update_ctrl_map(lv_obj_t * obj)
 {
     lv_keyboard_t * keyboard = (lv_keyboard_t *)obj;
 
-    if (keyboard->popovers) {
+    if(keyboard->popovers) {
         /*Apply the current control map (already includes LV_BTNMATRIX_CTRL_POPOVER flags)*/
         lv_btnmatrix_set_ctrl_map(obj, kb_ctrl[keyboard->mode]);
-    } else {
+    }
+    else {
         /*Make a copy of the current control map*/
         lv_btnmatrix_t * btnm = (lv_btnmatrix_t *)obj;
         lv_btnmatrix_ctrl_t * ctrl_map = lv_mem_alloc(btnm->btn_cnt * sizeof(lv_btnmatrix_ctrl_t));
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.h
index 4b867c282..7f65cd75a 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.h
@@ -63,8 +63,8 @@ extern const lv_obj_class_t lv_keyboard_class;
  **********************/
 
 /**
- * Create a keyboard objects
- * @param par pointer to an object, it will be the parent of the new keyboard
+ * Create a Keyboard object
+ * @param parent pointer to an object, it will be the parent of the new keyboard
  * @return pointer to the created keyboard
  */
 lv_obj_t * lv_keyboard_create(lv_obj_t * parent);
@@ -139,6 +139,28 @@ static inline const char ** lv_keyboard_get_map_array(const lv_obj_t * kb)
     return lv_btnmatrix_get_map(kb);
 }
 
+/**
+ * Get the index of the lastly "activated" button by the user (pressed, released, focused etc)
+ * Useful in the `event_cb` to get the text of the button, check if hidden etc.
+ * @param obj       pointer to button matrix object
+ * @return          index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset)
+ */
+static inline uint16_t lv_keyboard_get_selected_btn(const lv_obj_t * obj)
+{
+    return lv_btnmatrix_get_selected_btn(obj);
+}
+
+/**
+ * Get the button's text
+ * @param obj       pointer to button matrix object
+ * @param btn_id    the index a button not counting new line characters.
+ * @return          text of btn_index` button
+ */
+static inline const char * lv_keyboard_get_btn_text(const lv_obj_t * obj, uint16_t btn_id)
+{
+    return lv_btnmatrix_get_btn_text(obj, btn_id);
+}
+
 /*=====================
  * Other functions
  *====================*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.c
index 443d325ef..513ecfb9d 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.c
@@ -47,8 +47,8 @@ const lv_obj_class_t lv_led_class  = {
  **********************/
 
 /**
- * Create a led objects
- * @param par pointer to an object, it will be the parent of the new led
+ * Create a led object
+ * @param parent pointer to an object, it will be the parent of the new led
  * @return pointer to the created led
  */
 lv_obj_t * lv_led_create(lv_obj_t * parent)
@@ -66,7 +66,7 @@ lv_obj_t * lv_led_create(lv_obj_t * parent)
 /**
  * Set the color of the LED
  * @param led       pointer to a LED object
- * @param color     the color of the the LED
+ * @param color     the color of the LED
  */
 void lv_led_set_color(lv_obj_t * obj, lv_color_t color)
 {
@@ -178,15 +178,17 @@ static void lv_led_event(const lv_obj_class_t * class_p, lv_event_t * e)
         lv_obj_init_draw_rect_dsc(obj, LV_PART_MAIN, &rect_dsc);
 
         /*Use the original colors brightness to modify color->led*/
-        rect_dsc.bg_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_color));
-        rect_dsc.bg_grad_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.bg_grad_color));
+        rect_dsc.bg_grad.stops[0].color = lv_color_mix(led->color, lv_color_black(),
+                                                       lv_color_brightness(rect_dsc.bg_grad.stops[0].color));
+        rect_dsc.bg_grad.stops[1].color = lv_color_mix(led->color, lv_color_black(),
+                                                       lv_color_brightness(rect_dsc.bg_grad.stops[1].color));
         rect_dsc.shadow_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.shadow_color));
         rect_dsc.border_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.border_color));
         rect_dsc.outline_color = lv_color_mix(led->color, lv_color_black(), lv_color_brightness(rect_dsc.outline_color));
 
         /*Mix. the color with black proportionally with brightness*/
-        rect_dsc.bg_color   = lv_color_mix(rect_dsc.bg_color, lv_color_black(), led->bright);
-        rect_dsc.bg_grad_color   = lv_color_mix(rect_dsc.bg_grad_color, lv_color_black(), led->bright);
+        rect_dsc.bg_grad.stops[0].color   = lv_color_mix(rect_dsc.bg_grad.stops[0].color, lv_color_black(), led->bright);
+        rect_dsc.bg_grad.stops[1].color   = lv_color_mix(rect_dsc.bg_grad.stops[1].color, lv_color_black(), led->bright);
         rect_dsc.border_color = lv_color_mix(rect_dsc.border_color, lv_color_black(), led->bright);
         rect_dsc.shadow_color = lv_color_mix(rect_dsc.shadow_color, lv_color_black(), led->bright);
         rect_dsc.outline_color = lv_color_mix(rect_dsc.outline_color, lv_color_black(), led->bright);
@@ -198,10 +200,10 @@ static void lv_led_event(const lv_obj_class_t * class_p, lv_event_t * e)
         rect_dsc.shadow_spread = ((led->bright - LV_LED_BRIGHT_MIN) * rect_dsc.shadow_spread) /
                                  (LV_LED_BRIGHT_MAX - LV_LED_BRIGHT_MIN);
 
-        const lv_area_t * clip_area = lv_event_get_param(e);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
         lv_obj_draw_part_dsc_t  part_draw_dsc;
-        lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+        lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
         part_draw_dsc.draw_area = &obj->coords;
         part_draw_dsc.class_p = MY_CLASS;
         part_draw_dsc.type = LV_LED_DRAW_PART_RECTANGLE;
@@ -209,7 +211,7 @@ static void lv_led_event(const lv_obj_class_t * class_p, lv_event_t * e)
         part_draw_dsc.part = LV_PART_MAIN;
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-        lv_draw_rect(&obj->coords, clip_area, &rect_dsc);
+        lv_draw_rect(draw_ctx, &rect_dsc, &obj->coords);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
 }
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.h
index 0bc4aaa71..368bcd23c 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.h
@@ -57,8 +57,8 @@ typedef enum {
  **********************/
 
 /**
- * Create a led objects
- * @param par pointer to an object, it will be the parent of the new led
+ * Create a led object
+ * @param parent pointer to an object, it will be the parent of the new led
  * @return pointer to the created led
  */
 lv_obj_t * lv_led_create(lv_obj_t * parent);
@@ -66,7 +66,7 @@ lv_obj_t * lv_led_create(lv_obj_t * parent);
 /**
  * Set the color of the LED
  * @param led       pointer to a LED object
- * @param color     the color of the the LED
+ * @param color     the color of the LED
  */
 void lv_led_set_color(lv_obj_t * led, lv_color_t color);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.c
index 798fb708a..ea9ced729 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.c
@@ -81,10 +81,12 @@ lv_obj_t * lv_list_add_btn(lv_obj_t * list, const char * icon, const char * txt)
     lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT);
     lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);
 
+#if LV_USE_IMG == 1
     if(icon) {
         lv_obj_t * img = lv_img_create(obj);
         lv_img_set_src(img, icon);
     }
+#endif
 
     if(txt) {
         lv_obj_t * label = lv_label_create(obj);
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/lv_widgets.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/lv_widgets.h
index 0dcaccadd..114181022 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/lv_widgets.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/lv_widgets.h
@@ -20,6 +20,7 @@ extern "C" {
 #include "chart/lv_chart.h"
 #include "keyboard/lv_keyboard.h"
 #include "list/lv_list.h"
+#include "menu/lv_menu.h"
 #include "msgbox/lv_msgbox.h"
 #include "meter/lv_meter.h"
 #include "spinbox/lv_spinbox.h"
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/menu/lv_menu.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/menu/lv_menu.c
new file mode 100644
index 000000000..9c6b5423a
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/menu/lv_menu.c
@@ -0,0 +1,752 @@
+/**
+ * @file lv_menu.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_menu.h"
+
+#if LV_USE_MENU
+
+/*********************
+ *      DEFINES
+ *********************/
+#define MY_CLASS &lv_menu_class
+
+#include "../../../core/lv_obj.h"
+#include "../../layouts/flex/lv_flex.h"
+#include "../../../widgets/lv_label.h"
+#include "../../../widgets/lv_btn.h"
+#include "../../../widgets/lv_img.h"
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static void lv_menu_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void lv_menu_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void lv_menu_page_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void lv_menu_page_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void lv_menu_cont_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void lv_menu_section_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+
+const lv_obj_class_t lv_menu_class = {
+    .constructor_cb = lv_menu_constructor,
+    .destructor_cb = lv_menu_destructor,
+    .base_class = &lv_obj_class,
+    .width_def = (LV_DPI_DEF * 3) / 2,
+    .height_def = LV_DPI_DEF * 2,
+    .instance_size = sizeof(lv_menu_t)
+};
+const lv_obj_class_t lv_menu_page_class = {
+    .constructor_cb = lv_menu_page_constructor,
+    .destructor_cb = lv_menu_page_destructor,
+    .base_class = &lv_obj_class,
+    .width_def = LV_PCT(100),
+    .height_def = LV_SIZE_CONTENT,
+    .instance_size = sizeof(lv_menu_page_t)
+};
+
+const lv_obj_class_t lv_menu_cont_class = {
+    .constructor_cb = lv_menu_cont_constructor,
+    .base_class = &lv_obj_class,
+    .width_def = LV_PCT(100),
+    .height_def = LV_SIZE_CONTENT
+};
+
+const lv_obj_class_t lv_menu_section_class = {
+    .constructor_cb = lv_menu_section_constructor,
+    .base_class = &lv_obj_class,
+    .width_def = LV_PCT(100),
+    .height_def = LV_SIZE_CONTENT
+};
+
+const lv_obj_class_t lv_menu_separator_class = {
+    .base_class = &lv_obj_class,
+    .width_def = LV_SIZE_CONTENT,
+    .height_def = LV_SIZE_CONTENT
+};
+
+const lv_obj_class_t lv_menu_sidebar_cont_class = {
+    .base_class = &lv_obj_class
+};
+
+const lv_obj_class_t lv_menu_main_cont_class = {
+    .base_class = &lv_obj_class
+};
+
+const lv_obj_class_t lv_menu_main_header_cont_class = {
+    .base_class = &lv_obj_class
+};
+
+const lv_obj_class_t lv_menu_sidebar_header_cont_class = {
+    .base_class = &lv_obj_class
+};
+
+static void lv_menu_refr(lv_obj_t * obj);
+static void lv_menu_refr_sidebar_header_mode(lv_obj_t * obj);
+static void lv_menu_refr_main_header_mode(lv_obj_t * obj);
+static void lv_menu_load_page_event_cb(lv_event_t * e);
+static void lv_menu_obj_del_event_cb(lv_event_t * e);
+static void lv_menu_back_event_cb(lv_event_t * e);
+static void lv_menu_value_changed_event_cb(lv_event_t * e);
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+bool lv_menu_item_back_btn_is_root(lv_obj_t * menu, lv_obj_t * obj);
+void lv_menu_clear_history(lv_obj_t * obj);
+
+lv_obj_t * lv_menu_create(lv_obj_t * parent)
+{
+    LV_LOG_INFO("begin");
+    lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent);
+    lv_obj_class_init_obj(obj);
+    return obj;
+}
+
+lv_obj_t * lv_menu_page_create(lv_obj_t * parent, char * title)
+{
+    LV_LOG_INFO("begin");
+    lv_obj_t * obj = lv_obj_class_create_obj(&lv_menu_page_class, parent);
+    lv_obj_class_init_obj(obj);
+
+    lv_menu_page_t * page = (lv_menu_page_t *)obj;
+    page->title = title;
+
+    return obj;
+}
+
+lv_obj_t * lv_menu_cont_create(lv_obj_t * parent)
+{
+    LV_LOG_INFO("begin");
+    lv_obj_t * obj = lv_obj_class_create_obj(&lv_menu_cont_class, parent);
+    lv_obj_class_init_obj(obj);
+    return obj;
+}
+
+lv_obj_t * lv_menu_section_create(lv_obj_t * parent)
+{
+    LV_LOG_INFO("begin");
+    lv_obj_t * obj = lv_obj_class_create_obj(&lv_menu_section_class, parent);
+    lv_obj_class_init_obj(obj);
+    return obj;
+}
+
+lv_obj_t * lv_menu_separator_create(lv_obj_t * parent)
+{
+    LV_LOG_INFO("begin");
+    lv_obj_t * obj = lv_obj_class_create_obj(&lv_menu_separator_class, parent);
+    lv_obj_class_init_obj(obj);
+    return obj;
+}
+
+void lv_menu_refr(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    lv_ll_t * history_ll = &(menu->history_ll);
+
+    /* The current menu */
+    lv_menu_history_t * act_hist = _lv_ll_get_head(history_ll);
+
+    lv_obj_t * page = NULL;
+
+    if(act_hist != NULL) {
+        page = act_hist->page;
+        /* Delete the current item from the history */
+        _lv_ll_remove(history_ll, act_hist);
+        lv_mem_free(act_hist);
+        menu->cur_depth--;
+    }
+
+    /* Set it */
+    lv_menu_set_page(obj, page);
+}
+
+/*=====================
+ * Setter functions
+ *====================*/
+
+void lv_menu_set_page(lv_obj_t * obj, lv_obj_t * page)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    /* Hide previous page */
+    if(menu->main_page != NULL) {
+        lv_obj_set_parent(menu->main_page, menu->storage);
+    }
+
+    if(page != NULL) {
+        /* Add a new node */
+        lv_ll_t * history_ll = &(menu->history_ll);
+        lv_menu_history_t * new_node = _lv_ll_ins_head(history_ll);
+        new_node->page = page;
+        menu->cur_depth++;
+
+        /* Place page in main */
+        lv_obj_set_parent(page, menu->main);
+    }
+    else {
+        /* Empty page, clear history */
+        lv_menu_clear_history(obj);
+    }
+
+    menu->main_page = page;
+
+    /* If there is a selected tab, update checked state */
+    if(menu->selected_tab != NULL) {
+        if(menu->sidebar_page != NULL) {
+            lv_obj_add_state(menu->selected_tab, LV_STATE_CHECKED);
+        }
+        else {
+            lv_obj_clear_state(menu->selected_tab, LV_STATE_CHECKED);
+        }
+    }
+
+    /* Back btn management */
+    if(menu->sidebar_page != NULL) {
+        /* With sidebar enabled */
+        if(menu->sidebar_generated) {
+            if(menu->mode_root_back_btn == LV_MENU_ROOT_BACK_BTN_ENABLED) {
+                /* Root back btn is always shown if enabled*/
+                lv_obj_clear_flag(menu->sidebar_header_back_btn, LV_OBJ_FLAG_HIDDEN);
+                lv_obj_add_flag(menu->sidebar_header_back_btn, LV_OBJ_FLAG_CLICKABLE);
+            }
+            else {
+                lv_obj_add_flag(menu->sidebar_header_back_btn, LV_OBJ_FLAG_HIDDEN);
+                lv_obj_clear_flag(menu->sidebar_header_back_btn, LV_OBJ_FLAG_CLICKABLE);
+            }
+        }
+
+        if(menu->cur_depth >= 2) {
+            lv_obj_clear_flag(menu->main_header_back_btn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_add_flag(menu->main_header_back_btn, LV_OBJ_FLAG_CLICKABLE);
+        }
+        else {
+            lv_obj_add_flag(menu->main_header_back_btn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_clear_flag(menu->main_header_back_btn, LV_OBJ_FLAG_CLICKABLE);
+        }
+    }
+    else {
+        /* With sidebar disabled */
+        if(menu->cur_depth >= 2 || menu->mode_root_back_btn == LV_MENU_ROOT_BACK_BTN_ENABLED) {
+            lv_obj_clear_flag(menu->main_header_back_btn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_add_flag(menu->main_header_back_btn, LV_OBJ_FLAG_CLICKABLE);
+        }
+        else {
+            lv_obj_add_flag(menu->main_header_back_btn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_clear_flag(menu->main_header_back_btn, LV_OBJ_FLAG_CLICKABLE);
+        }
+    }
+
+    lv_event_send((lv_obj_t *)menu, LV_EVENT_VALUE_CHANGED, NULL);
+
+    lv_menu_refr_main_header_mode(obj);
+}
+
+void lv_menu_set_sidebar_page(lv_obj_t * obj, lv_obj_t * page)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    /* Sidebar management*/
+    if(page != NULL) {
+        /* Sidebar should be enabled */
+        if(!menu->sidebar_generated) {
+            /* Create sidebar */
+            lv_obj_t * sidebar_cont = lv_obj_class_create_obj(&lv_menu_sidebar_cont_class, obj);
+            lv_obj_class_init_obj(sidebar_cont);
+            lv_obj_move_to_index(sidebar_cont, 1);
+            lv_obj_set_size(sidebar_cont, LV_PCT(30), LV_PCT(100));
+            lv_obj_set_flex_flow(sidebar_cont, LV_FLEX_FLOW_COLUMN);
+            lv_obj_add_flag(sidebar_cont, LV_OBJ_FLAG_EVENT_BUBBLE);
+            lv_obj_clear_flag(sidebar_cont, LV_OBJ_FLAG_CLICKABLE);
+            menu->sidebar = sidebar_cont;
+
+            lv_obj_t * sidebar_header = lv_obj_class_create_obj(&lv_menu_sidebar_header_cont_class, sidebar_cont);
+            lv_obj_class_init_obj(sidebar_header);
+            lv_obj_set_size(sidebar_header, LV_PCT(100), LV_SIZE_CONTENT);
+            lv_obj_set_flex_flow(sidebar_header, LV_FLEX_FLOW_ROW);
+            lv_obj_set_flex_align(sidebar_header, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+            lv_obj_clear_flag(sidebar_header, LV_OBJ_FLAG_CLICKABLE);
+            lv_obj_add_flag(sidebar_header, LV_OBJ_FLAG_EVENT_BUBBLE);
+            menu->sidebar_header = sidebar_header;
+
+            lv_obj_t * sidebar_header_back_btn = lv_btn_create(menu->sidebar_header);
+            lv_obj_add_event_cb(sidebar_header_back_btn, lv_menu_back_event_cb, LV_EVENT_CLICKED, menu);
+            lv_obj_add_flag(sidebar_header_back_btn, LV_OBJ_FLAG_EVENT_BUBBLE);
+            lv_obj_set_flex_flow(sidebar_header_back_btn, LV_FLEX_FLOW_ROW);
+            menu->sidebar_header_back_btn = sidebar_header_back_btn;
+
+            lv_obj_t * sidebar_header_back_icon = lv_img_create(menu->sidebar_header_back_btn);
+            lv_img_set_src(sidebar_header_back_icon, LV_SYMBOL_LEFT);
+
+            lv_obj_t * sidebar_header_title = lv_label_create(menu->sidebar_header);
+            lv_obj_add_flag(sidebar_header_title, LV_OBJ_FLAG_HIDDEN);
+            menu->sidebar_header_title = sidebar_header_title;
+
+            menu->sidebar_generated = true;
+        }
+
+        lv_obj_set_parent(page, menu->sidebar);
+
+        lv_menu_refr_sidebar_header_mode(obj);
+    }
+    else {
+        /* Sidebar should be disabled */
+        if(menu->sidebar_generated) {
+            lv_obj_set_parent(menu->sidebar_page, menu->storage);
+            lv_obj_del(menu->sidebar);
+
+            menu->sidebar_generated = false;
+        }
+    }
+
+    menu->sidebar_page = page;
+    lv_menu_refr(obj);
+}
+
+void lv_menu_set_mode_header(lv_obj_t * obj, lv_menu_mode_header_t mode_header)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    if(menu->mode_header != mode_header) {
+        menu->mode_header = mode_header;
+        lv_menu_refr_main_header_mode(obj);
+        if(menu->sidebar_generated) lv_menu_refr_sidebar_header_mode(obj);
+    }
+}
+
+void lv_menu_set_mode_root_back_btn(lv_obj_t * obj, lv_menu_mode_root_back_btn_t mode_root_back_btn)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    if(menu->mode_root_back_btn != mode_root_back_btn) {
+        menu->mode_root_back_btn = mode_root_back_btn;
+        lv_menu_refr(obj);
+    }
+}
+
+void lv_menu_set_load_page_event(lv_obj_t * menu, lv_obj_t * obj, lv_obj_t * page)
+{
+    LV_ASSERT_OBJ(menu, MY_CLASS);
+
+    /* Make the object clickable */
+    lv_obj_add_flag(obj, LV_OBJ_FLAG_CLICKABLE);
+
+    /* Remove old event */
+    if(lv_obj_remove_event_cb(obj, lv_menu_load_page_event_cb)) {
+        lv_event_send(obj, LV_EVENT_DELETE, NULL);
+        lv_obj_remove_event_cb(obj, lv_menu_obj_del_event_cb);
+    }
+
+    lv_menu_load_page_event_data_t * event_data = lv_mem_alloc(sizeof(lv_menu_load_page_event_data_t));
+    event_data->menu = menu;
+    event_data->page = page;
+
+    lv_obj_add_event_cb(obj, lv_menu_load_page_event_cb, LV_EVENT_CLICKED, event_data);
+    lv_obj_add_event_cb(obj, lv_menu_obj_del_event_cb, LV_EVENT_DELETE, event_data);
+}
+
+/*=====================
+ * Getter functions
+ *====================*/
+lv_obj_t * lv_menu_get_cur_main_page(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    return menu->main_page;
+}
+
+lv_obj_t * lv_menu_get_cur_sidebar_page(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    return menu->sidebar_page;
+}
+
+lv_obj_t * lv_menu_get_main_header(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    return menu->main_header;
+}
+
+lv_obj_t * lv_menu_get_main_header_back_btn(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    return menu->main_header_back_btn;
+}
+
+lv_obj_t * lv_menu_get_sidebar_header(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    return menu->sidebar_header;
+}
+
+lv_obj_t * lv_menu_get_sidebar_header_back_btn(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    return menu->sidebar_header_back_btn;
+}
+
+bool lv_menu_back_btn_is_root(lv_obj_t * menu, lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(menu, MY_CLASS);
+
+    if(obj == ((lv_menu_t *)menu)->sidebar_header_back_btn) {
+        return true;
+    }
+
+    if(obj == ((lv_menu_t *)menu)->main_header_back_btn && ((lv_menu_t *)menu)->prev_depth <= 1) {
+        return true;
+    }
+
+    return false;
+}
+
+void lv_menu_clear_history(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    lv_ll_t * history_ll = &(menu->history_ll);
+
+    _lv_ll_clear(history_ll);
+
+    menu->cur_depth = 0;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+static void lv_menu_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+    LV_TRACE_OBJ_CREATE("begin");
+
+    lv_obj_set_layout(obj, LV_LAYOUT_FLEX);
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    menu->mode_header = LV_MENU_HEADER_TOP_FIXED;
+    menu->mode_root_back_btn = LV_MENU_ROOT_BACK_BTN_DISABLED;
+    menu->cur_depth = 0;
+    menu->prev_depth = 0;
+    menu->sidebar_generated = false;
+
+    _lv_ll_init(&(menu->history_ll), sizeof(lv_menu_history_t));
+
+    menu->storage = lv_obj_create(obj);
+    lv_obj_add_flag(menu->storage, LV_OBJ_FLAG_HIDDEN);
+
+    menu->sidebar = NULL;
+    menu->sidebar_header = NULL;
+    menu->sidebar_header_back_btn = NULL;
+    menu->sidebar_header_title = NULL;
+    menu->sidebar_page = NULL;
+
+    lv_obj_t * main_cont = lv_obj_class_create_obj(&lv_menu_main_cont_class, obj);
+    lv_obj_class_init_obj(main_cont);
+    lv_obj_set_height(main_cont, LV_PCT(100));
+    lv_obj_set_flex_grow(main_cont, 1);
+    lv_obj_set_flex_flow(main_cont, LV_FLEX_FLOW_COLUMN);
+    lv_obj_add_flag(main_cont, LV_OBJ_FLAG_EVENT_BUBBLE);
+    lv_obj_clear_flag(main_cont, LV_OBJ_FLAG_CLICKABLE);
+    menu->main = main_cont;
+
+    lv_obj_t * main_header = lv_obj_class_create_obj(&lv_menu_main_header_cont_class, main_cont);
+    lv_obj_class_init_obj(main_header);
+    lv_obj_set_size(main_header, LV_PCT(100), LV_SIZE_CONTENT);
+    lv_obj_set_flex_flow(main_header, LV_FLEX_FLOW_ROW);
+    lv_obj_set_flex_align(main_header, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+    lv_obj_clear_flag(main_header, LV_OBJ_FLAG_CLICKABLE);
+    lv_obj_add_flag(main_header, LV_OBJ_FLAG_EVENT_BUBBLE);
+    menu->main_header = main_header;
+
+    /* Create the default simple back btn and title */
+    lv_obj_t * main_header_back_btn = lv_btn_create(menu->main_header);
+    lv_obj_add_event_cb(main_header_back_btn, lv_menu_back_event_cb, LV_EVENT_CLICKED, menu);
+    lv_obj_add_flag(main_header_back_btn, LV_OBJ_FLAG_EVENT_BUBBLE);
+    lv_obj_set_flex_flow(main_header_back_btn, LV_FLEX_FLOW_ROW);
+    menu->main_header_back_btn = main_header_back_btn;
+
+    lv_obj_t * main_header_back_icon = lv_img_create(menu->main_header_back_btn);
+    lv_img_set_src(main_header_back_icon, LV_SYMBOL_LEFT);
+
+    lv_obj_t * main_header_title = lv_label_create(menu->main_header);
+    lv_obj_add_flag(main_header_title, LV_OBJ_FLAG_HIDDEN);
+    menu->main_header_title = main_header_title;
+
+    menu->main_page = NULL;
+    menu->selected_tab = NULL;
+
+    lv_obj_add_event_cb(obj, lv_menu_value_changed_event_cb, LV_EVENT_VALUE_CHANGED, menu);
+
+    LV_TRACE_OBJ_CREATE("finished");
+}
+
+static void lv_menu_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+    LV_TRACE_OBJ_CREATE("begin");
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+    lv_ll_t * history_ll = &(menu->history_ll);
+
+    _lv_ll_clear(history_ll);
+
+    LV_TRACE_OBJ_CREATE("finished");
+}
+
+static void lv_menu_page_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+
+    lv_menu_t * menu = (lv_menu_t *)lv_obj_get_parent(obj);
+
+    lv_obj_set_parent(obj, ((lv_menu_t *)menu)->storage);
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
+    lv_obj_set_flex_align(obj, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+    lv_obj_add_flag(obj, LV_OBJ_FLAG_EVENT_BUBBLE);
+}
+
+static void lv_menu_page_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+
+    lv_menu_page_t * page = (lv_menu_page_t *)obj;
+
+    if(page->title != NULL) {
+        lv_mem_free(page->title);
+        page->title = NULL;
+    }
+}
+
+static void lv_menu_cont_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);
+    lv_obj_set_flex_align(obj, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+    lv_obj_clear_flag(obj, LV_OBJ_FLAG_CLICKABLE);
+}
+
+static void lv_menu_section_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
+{
+    LV_UNUSED(class_p);
+    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
+    lv_obj_clear_flag(obj, LV_OBJ_FLAG_CLICKABLE);
+}
+
+static void lv_menu_refr_sidebar_header_mode(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    if(menu->sidebar_header == NULL || menu->sidebar_page == NULL) return;
+
+    switch(menu->mode_header) {
+        case LV_MENU_HEADER_TOP_FIXED:
+            /* Content should fill the remaining space */
+            lv_obj_move_to_index(menu->sidebar_header, 0);
+            lv_obj_set_flex_grow(menu->sidebar_page, 1);
+            break;
+        case LV_MENU_HEADER_TOP_UNFIXED:
+            lv_obj_move_to_index(menu->sidebar_header, 0);
+            lv_obj_set_flex_grow(menu->sidebar_page, 0);
+            break;
+        case LV_MENU_HEADER_BOTTOM_FIXED:
+            lv_obj_move_to_index(menu->sidebar_header, 1);
+            lv_obj_set_flex_grow(menu->sidebar_page, 1);
+            break;
+    }
+
+    lv_obj_refr_size(menu->sidebar_header);
+    lv_obj_refr_size(menu->sidebar_page);
+
+    if(lv_obj_get_content_height(menu->sidebar_header) == 0) {
+        lv_obj_add_flag(menu->sidebar_header, LV_OBJ_FLAG_HIDDEN);
+    }
+    else {
+        lv_obj_clear_flag(menu->sidebar_header, LV_OBJ_FLAG_HIDDEN);
+    }
+}
+
+static void lv_menu_refr_main_header_mode(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    if(menu->main_header == NULL || menu->main_page == NULL) return;
+
+    switch(menu->mode_header) {
+        case LV_MENU_HEADER_TOP_FIXED:
+            /* Content should fill the remaining space */
+            lv_obj_move_to_index(menu->main_header, 0);
+            lv_obj_set_flex_grow(menu->main_page, 1);
+            break;
+        case LV_MENU_HEADER_TOP_UNFIXED:
+            lv_obj_move_to_index(menu->main_header, 0);
+            lv_obj_set_flex_grow(menu->main_page, 0);
+            break;
+        case LV_MENU_HEADER_BOTTOM_FIXED:
+            lv_obj_move_to_index(menu->main_header, 1);
+            lv_obj_set_flex_grow(menu->main_page, 1);
+            break;
+    }
+
+    lv_obj_refr_size(menu->main_header);
+    lv_obj_refr_size(menu->main_page);
+    lv_obj_update_layout(menu->main_header);
+
+    if(lv_obj_get_content_height(menu->main_header) == 0) {
+        lv_obj_add_flag(menu->main_header, LV_OBJ_FLAG_HIDDEN);
+    }
+    else {
+        lv_obj_clear_flag(menu->main_header, LV_OBJ_FLAG_HIDDEN);
+    }
+}
+
+static void lv_menu_load_page_event_cb(lv_event_t * e)
+{
+    lv_obj_t * obj = lv_event_get_target(e);
+    lv_menu_load_page_event_data_t * event_data = lv_event_get_user_data(e);
+    lv_menu_t * menu = (lv_menu_t *)(event_data->menu);
+    lv_obj_t * page = event_data->page;
+
+    if(menu->sidebar_page != NULL) {
+        /* Check if clicked obj is in the sidebar */
+        bool sidebar = false;
+        lv_obj_t * parent = obj;
+
+        while(parent) {
+            if(parent == (lv_obj_t *)menu) break;
+            if(parent == menu->sidebar) {
+                sidebar = true;
+                break;
+            }
+            parent = lv_obj_get_parent(parent);
+        }
+
+        if(sidebar) {
+            /* Clear checked state of previous obj */
+            if(menu->selected_tab != obj && menu->selected_tab != NULL) {
+                lv_obj_clear_state(menu->selected_tab, LV_STATE_CHECKED);
+            }
+
+            lv_menu_clear_history((lv_obj_t *)menu);
+
+            menu->selected_tab = obj;
+        }
+    }
+
+    lv_menu_set_page((lv_obj_t *)menu, page);
+}
+
+static void lv_menu_obj_del_event_cb(lv_event_t * e)
+{
+    lv_menu_load_page_event_data_t * event_data = lv_event_get_user_data(e);
+    lv_mem_free(event_data);
+}
+
+static void lv_menu_back_event_cb(lv_event_t * e)
+{
+    lv_event_code_t code = lv_event_get_code(e);
+    /* LV_EVENT_CLICKED */
+    if(code == LV_EVENT_CLICKED) {
+        lv_obj_t * obj = lv_event_get_target(e);
+        lv_menu_t * menu = (lv_menu_t *)lv_event_get_user_data(e);
+
+        if(!(obj == menu->main_header_back_btn || obj == menu->sidebar_header_back_btn)) return;
+
+        menu->prev_depth = menu->cur_depth; /* Save the previous value for user event handler */
+
+        if(lv_menu_back_btn_is_root((lv_obj_t *)menu, obj)) return;
+
+        lv_ll_t * history_ll = &(menu->history_ll);
+
+        /* The current menu */
+        lv_menu_history_t * act_hist = _lv_ll_get_head(history_ll);
+
+        /* The previous menu */
+        lv_menu_history_t * prev_hist = _lv_ll_get_next(history_ll, act_hist);
+
+        if(prev_hist != NULL) {
+            /* Previous menu exists */
+            /* Delete the current item from the history */
+            _lv_ll_remove(history_ll, act_hist);
+            lv_mem_free(act_hist);
+            menu->cur_depth--;
+            /* Create the previous menu.
+            *  Remove it from the history because `lv_menu_set_page` will add it again */
+            _lv_ll_remove(history_ll, prev_hist);
+            menu->cur_depth--;
+            lv_menu_set_page(&(menu->obj), prev_hist->page);
+
+            lv_mem_free(prev_hist);
+        }
+    }
+}
+
+static void lv_menu_value_changed_event_cb(lv_event_t * e)
+{
+    lv_obj_t * obj = lv_event_get_user_data(e);
+    lv_menu_t * menu = (lv_menu_t *)obj;
+
+    lv_menu_page_t * main_page = (lv_menu_page_t *)lv_menu_get_cur_main_page(obj);
+    if(main_page != NULL && menu->main_header_title != NULL) {
+        if(main_page->title != NULL) {
+            lv_label_set_text(menu->main_header_title, main_page->title);
+            lv_obj_clear_flag(menu->main_header_title, LV_OBJ_FLAG_HIDDEN);
+        }
+        else {
+            lv_obj_add_flag(menu->main_header_title, LV_OBJ_FLAG_HIDDEN);
+        }
+    }
+
+    lv_menu_page_t * sidebar_page = (lv_menu_page_t *)lv_menu_get_cur_sidebar_page(obj);
+    if(sidebar_page != NULL && menu->sidebar_header_title != NULL) {
+        if(sidebar_page->title != NULL) {
+            lv_label_set_text(menu->sidebar_header_title, sidebar_page->title);
+            lv_obj_clear_flag(menu->sidebar_header_title, LV_OBJ_FLAG_HIDDEN);
+        }
+        else {
+            lv_obj_add_flag(menu->sidebar_header_title, LV_OBJ_FLAG_HIDDEN);
+        }
+    }
+}
+#endif /*LV_USE_MENU*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/menu/lv_menu.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/menu/lv_menu.h
new file mode 100644
index 000000000..0449059f8
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/menu/lv_menu.h
@@ -0,0 +1,233 @@
+/**
+ * @file lv_menu.h
+ *
+ */
+
+#ifndef LV_MENU_H
+#define LV_MENU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "../../../core/lv_obj.h"
+
+#if LV_USE_MENU
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+enum {
+    LV_MENU_HEADER_TOP_FIXED, /* Header is positioned at the top */
+    LV_MENU_HEADER_TOP_UNFIXED, /* Header is positioned at the top and can be scrolled out of view*/
+    LV_MENU_HEADER_BOTTOM_FIXED /* Header is positioned at the bottom */
+};
+typedef uint8_t lv_menu_mode_header_t;
+
+enum {
+    LV_MENU_ROOT_BACK_BTN_DISABLED,
+    LV_MENU_ROOT_BACK_BTN_ENABLED
+};
+typedef uint8_t lv_menu_mode_root_back_btn_t;
+
+typedef struct lv_menu_load_page_event_data_t {
+    lv_obj_t * menu;
+    lv_obj_t * page;
+} lv_menu_load_page_event_data_t;
+
+typedef struct {
+    lv_obj_t * page;
+} lv_menu_history_t;
+
+typedef struct {
+    lv_obj_t obj;
+    lv_obj_t * storage; /* a pointer to obj that is the parent of all pages not displayed */
+    lv_obj_t * main;
+    lv_obj_t * main_page;
+    lv_obj_t * main_header;
+    lv_obj_t *
+    main_header_back_btn; /* a pointer to obj that on click triggers back btn event handler, can be same as 'main_header' */
+    lv_obj_t * main_header_title;
+    lv_obj_t * sidebar;
+    lv_obj_t * sidebar_page;
+    lv_obj_t * sidebar_header;
+    lv_obj_t *
+    sidebar_header_back_btn; /* a pointer to obj that on click triggers back btn event handler, can be same as 'sidebar_header' */
+    lv_obj_t * sidebar_header_title;
+    lv_obj_t * selected_tab;
+    lv_ll_t history_ll;
+    uint8_t cur_depth;
+    uint8_t prev_depth;
+    uint8_t sidebar_generated : 1;
+    lv_menu_mode_header_t mode_header : 2;
+    lv_menu_mode_root_back_btn_t mode_root_back_btn : 1;
+} lv_menu_t;
+
+typedef struct {
+    lv_obj_t obj;
+    char * title;
+} lv_menu_page_t;
+
+extern const lv_obj_class_t lv_menu_class;
+extern const lv_obj_class_t lv_menu_page_class;
+extern const lv_obj_class_t lv_menu_cont_class;
+extern const lv_obj_class_t lv_menu_section_class;
+extern const lv_obj_class_t lv_menu_separator_class;
+extern const lv_obj_class_t lv_menu_sidebar_cont_class;
+extern const lv_obj_class_t lv_menu_main_cont_class;
+extern const lv_obj_class_t lv_menu_sidebar_header_cont_class;
+extern const lv_obj_class_t lv_menu_main_header_cont_class;
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Create a menu object
+ * @param parent pointer to an object, it will be the parent of the new menu
+ * @return pointer to the created menu
+ */
+lv_obj_t * lv_menu_create(lv_obj_t * parent);
+
+/**
+ * Create a menu page object
+ * @param parent pointer to menu object
+ * @param title pointer to text for title in header (NULL to not display title)
+ * @return pointer to the created menu page
+ */
+lv_obj_t * lv_menu_page_create(lv_obj_t * parent, char * title);
+
+/**
+ * Create a menu cont object
+ * @param parent pointer to an object, it will be the parent of the new menu cont object
+ * @return pointer to the created menu cont
+ */
+lv_obj_t * lv_menu_cont_create(lv_obj_t * parent);
+
+/**
+ * Create a menu section object
+ * @param parent pointer to an object, it will be the parent of the new menu section object
+ * @return pointer to the created menu section
+ */
+lv_obj_t * lv_menu_section_create(lv_obj_t * parent);
+
+/**
+ * Create a menu separator object
+ * @param parent pointer to an object, it will be the parent of the new menu separator object
+ * @return pointer to the created menu separator
+ */
+lv_obj_t * lv_menu_separator_create(lv_obj_t * parent);
+/*=====================
+ * Setter functions
+ *====================*/
+/**
+ * Set menu page to display in main
+ * @param obj pointer to the menu
+ * @param page pointer to the menu page to set (NULL to clear main and clear menu history)
+ */
+void lv_menu_set_page(lv_obj_t * obj, lv_obj_t * page);
+
+/**
+ * Set menu page to display in sidebar
+ * @param obj pointer to the menu
+ * @param page pointer to the menu page to set (NULL to clear sidebar)
+ */
+void lv_menu_set_sidebar_page(lv_obj_t * obj, lv_obj_t * page);
+
+/**
+ * Set the how the header should behave and its position
+ * @param obj pointer to a menu
+ * @param mode_header
+ */
+void lv_menu_set_mode_header(lv_obj_t * obj, lv_menu_mode_header_t mode_header);
+
+/**
+ * Set whether back button should appear at root
+ * @param obj pointer to a menu
+ * @param mode_root_back_btn
+ */
+void lv_menu_set_mode_root_back_btn(lv_obj_t * obj, lv_menu_mode_root_back_btn_t mode_root_back_btn);
+
+/**
+ * Add menu to the menu item
+ * @param menu pointer to the menu
+ * @param obj pointer to the obj
+ * @param page pointer to the page to load when obj is clicked
+ */
+void lv_menu_set_load_page_event(lv_obj_t * menu, lv_obj_t * obj, lv_obj_t * page);
+
+/*=====================
+ * Getter functions
+ *====================*/
+/**
+* Get a pointer to menu page that is currently displayed in main
+* @param obj pointer to the menu
+* @return pointer to current page
+*/
+lv_obj_t * lv_menu_get_cur_main_page(lv_obj_t * obj);
+
+/**
+* Get a pointer to menu page that is currently displayed in sidebar
+* @param obj pointer to the menu
+* @return pointer to current page
+*/
+lv_obj_t * lv_menu_get_cur_sidebar_page(lv_obj_t * obj);
+
+/**
+* Get a pointer to main header obj
+* @param obj pointer to the menu
+* @return pointer to main header obj
+*/
+lv_obj_t * lv_menu_get_main_header(lv_obj_t * obj);
+
+/**
+* Get a pointer to main header back btn obj
+* @param obj pointer to the menu
+* @return pointer to main header back btn obj
+*/
+lv_obj_t * lv_menu_get_main_header_back_btn(lv_obj_t * obj);
+
+/**
+* Get a pointer to sidebar header obj
+* @param obj pointer to the menu
+* @return pointer to sidebar header obj
+*/
+lv_obj_t * lv_menu_get_sidebar_header(lv_obj_t * obj);
+
+/**
+* Get a pointer to sidebar header obj
+* @param obj pointer to the menu
+* @return pointer to sidebar header back btn obj
+*/
+lv_obj_t * lv_menu_get_sidebar_header_back_btn(lv_obj_t * obj);
+
+/**
+ * Check if an obj is a root back btn
+ * @param menu pointer to the menu
+ * @return true if it is a root back btn
+ */
+bool lv_menu_back_btn_is_root(lv_obj_t * menu, lv_obj_t * obj);
+
+/**
+ * Clear menu history
+ * @param obj pointer to the menu
+ */
+void lv_menu_clear_history(lv_obj_t * obj);
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*LV_USE_MENU*/
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_MENU_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.c
index 0932ecec7..c12dc33c9 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.c
@@ -26,9 +26,9 @@
 static void lv_meter_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_meter_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_meter_event(const lv_obj_class_t * class_p, lv_event_t * e);
-static void draw_arcs(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area_t * scale_area);
-static void draw_ticks_and_labels(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area_t * scale_area);
-static void draw_needles(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area_t * scale_area);
+static void draw_arcs(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, const lv_area_t * scale_area);
+static void draw_ticks_and_labels(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, const lv_area_t * scale_area);
+static void draw_needles(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, const lv_area_t * scale_area);
 static void inv_arc(lv_obj_t * obj, lv_meter_indicator_t * indic, int32_t old_value, int32_t new_value);
 static void inv_line(lv_obj_t * obj, lv_meter_indicator_t * indic, int32_t value);
 
@@ -296,13 +296,13 @@ static void lv_meter_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t * obj = lv_event_get_target(e);
     if(code == LV_EVENT_DRAW_MAIN) {
-        const lv_area_t * clip_area = lv_event_get_param(e);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
         lv_area_t scale_area;
         lv_obj_get_content_coords(obj, &scale_area);
 
-        draw_arcs(obj, clip_area, &scale_area);
-        draw_ticks_and_labels(obj, clip_area, &scale_area);
-        draw_needles(obj, clip_area, &scale_area);
+        draw_arcs(obj, draw_ctx, &scale_area);
+        draw_ticks_and_labels(obj, draw_ctx, &scale_area);
+        draw_needles(obj, draw_ctx, &scale_area);
 
         lv_coord_t r_edge = lv_area_get_width(&scale_area) / 2;
         lv_point_t scale_center;
@@ -319,11 +319,11 @@ static void lv_meter_event(const lv_obj_class_t * class_p, lv_event_t * e)
         nm_cord.y1 = scale_center.y - h;
         nm_cord.x2 = scale_center.x + w;
         nm_cord.y2 = scale_center.y + h;
-        lv_draw_rect(&nm_cord, clip_area, &mid_dsc);
+        lv_draw_rect(draw_ctx, &mid_dsc, &nm_cord);
     }
 }
 
-static void draw_arcs(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area_t * scale_area)
+static void draw_arcs(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, const lv_area_t * scale_area)
 {
     lv_meter_t * meter = (lv_meter_t *)obj;
 
@@ -340,7 +340,7 @@ static void draw_arcs(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area
     lv_meter_indicator_t * indic;
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.arc_dsc = &arc_dsc;
     part_draw_dsc.part = LV_PART_INDICATOR;
     part_draw_dsc.class_p = MY_CLASS;
@@ -365,12 +365,12 @@ static void draw_arcs(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area
         part_draw_dsc.p1 = &scale_center;
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-        lv_draw_arc(scale_center.x, scale_center.y, part_draw_dsc.radius, start_angle, end_angle, clip_area, &arc_dsc);
+        lv_draw_arc(draw_ctx, &arc_dsc, &scale_center, part_draw_dsc.radius, start_angle, end_angle);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
 }
 
-static void draw_ticks_and_labels(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area_t * scale_area)
+static void draw_ticks_and_labels(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, const lv_area_t * scale_area)
 {
     lv_meter_t * meter    = (lv_meter_t *)obj;
 
@@ -397,7 +397,7 @@ static void draw_ticks_and_labels(lv_obj_t * obj, const lv_area_t * clip_area, c
     lv_draw_mask_radius_param_t outer_mask;
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.part = LV_PART_TICKS;
     part_draw_dsc.type = LV_METER_DRAW_PART_TICK;
@@ -532,7 +532,7 @@ static void draw_ticks_and_labels(lv_obj_t * obj, const lv_area_t * clip_area, c
                 label_cord.x2 = label_cord.x1 + label_size.x;
                 label_cord.y2 = label_cord.y1 + label_size.y;
 
-                lv_draw_label(&label_cord, clip_area, &label_dsc, part_draw_dsc.text, NULL);
+                lv_draw_label(draw_ctx, part_draw_dsc.label_dsc, &label_cord, part_draw_dsc.text, NULL);
 
                 outer_mask_id = lv_draw_mask_add(&outer_mask, NULL);
             }
@@ -543,7 +543,7 @@ static void draw_ticks_and_labels(lv_obj_t * obj, const lv_area_t * clip_area, c
             }
 
             inner_act_mask_id = lv_draw_mask_add(major ? &inner_major_mask : &inner_minor_mask, NULL);
-            lv_draw_line(&p_outer, &p_center, clip_area, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &p_outer, &p_center);
             lv_draw_mask_remove_id(inner_act_mask_id);
             lv_event_send(obj, LV_EVENT_DRAW_MAIN_END, &part_draw_dsc);
 
@@ -559,7 +559,7 @@ static void draw_ticks_and_labels(lv_obj_t * obj, const lv_area_t * clip_area, c
 }
 
 
-static void draw_needles(lv_obj_t * obj, const lv_area_t * clip_area, const lv_area_t * scale_area)
+static void draw_needles(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx, const lv_area_t * scale_area)
 {
     lv_meter_t * meter = (lv_meter_t *)obj;
 
@@ -578,7 +578,7 @@ static void draw_needles(lv_obj_t * obj, const lv_area_t * clip_area, const lv_a
     lv_opa_t opa_main = lv_obj_get_style_opa(obj, LV_PART_MAIN);
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.p1 = &scale_center;
 
@@ -602,7 +602,7 @@ static void draw_needles(lv_obj_t * obj, const lv_area_t * clip_area, const lv_a
             part_draw_dsc.p2 = &p_end;
 
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-            lv_draw_line(&scale_center, &p_end, clip_area, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &scale_center, &p_end);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
         }
         else if(indic->type == LV_METER_INDICATOR_TYPE_NEEDLE_IMG) {
@@ -627,7 +627,7 @@ static void draw_needles(lv_obj_t * obj, const lv_area_t * clip_area, const lv_a
             part_draw_dsc.img_dsc = &img_dsc;
 
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-            lv_draw_img(&a, clip_area, indic->type_data.needle_img.src, &img_dsc);
+            lv_draw_img(draw_ctx, &img_dsc, &a, indic->type_data.needle_img.src);
             lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
         }
     }
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.h
index 3626fbad1..24c1dae0f 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.h
@@ -115,7 +115,7 @@ typedef enum {
  **********************/
 
 /**
- * Create a meter objects
+ * Create a Meter object
  * @param parent pointer to an object, it will be the parent of the new bar.
  * @return pointer to the created meter
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.c
index d8a6817e2..a62c9ae63 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.c
@@ -30,24 +30,24 @@ static void msgbox_close_click_event_cb(lv_event_t * e);
  *  STATIC VARIABLES
  **********************/
 const lv_obj_class_t lv_msgbox_class = {
-        .base_class = &lv_obj_class,
-        .width_def = LV_DPI_DEF * 2,
-        .height_def = LV_SIZE_CONTENT,
-        .instance_size = sizeof(lv_msgbox_t)
+    .base_class = &lv_obj_class,
+    .width_def = LV_DPI_DEF * 2,
+    .height_def = LV_SIZE_CONTENT,
+    .instance_size = sizeof(lv_msgbox_t)
 };
 
 const lv_obj_class_t lv_msgbox_content_class = {
-        .base_class = &lv_obj_class,
-        .width_def = LV_PCT(100),
-        .height_def = LV_SIZE_CONTENT,
-        .instance_size = sizeof(lv_obj_t)
+    .base_class = &lv_obj_class,
+    .width_def = LV_PCT(100),
+    .height_def = LV_SIZE_CONTENT,
+    .instance_size = sizeof(lv_obj_t)
 };
 
 const lv_obj_class_t lv_msgbox_backdrop_class = {
-        .base_class = &lv_obj_class,
-        .width_def = LV_PCT(100),
-        .height_def = LV_PCT(100),
-        .instance_size = sizeof(lv_obj_t)
+    .base_class = &lv_obj_class,
+    .width_def = LV_PCT(100),
+    .height_def = LV_PCT(100),
+    .instance_size = sizeof(lv_obj_t)
 };
 
 /**********************
@@ -85,7 +85,7 @@ lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char *
     bool has_title = title && strlen(title) > 0;
 
     /*When a close button is required, we need the empty label as spacer to push the button to the right*/
-    if (add_close_btn || has_title) {
+    if(add_close_btn || has_title) {
         mbox->title = lv_label_create(obj);
         lv_label_set_text(mbox->title, has_title ? title : "");
         lv_label_set_long_mode(mbox->title, LV_LABEL_LONG_SCROLL_CIRCULAR);
@@ -108,7 +108,7 @@ lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char *
     mbox->content = lv_obj_class_create_obj(&lv_msgbox_content_class, obj);
 
     bool has_txt = txt && strlen(txt) > 0;
-    if (has_txt) {
+    if(has_txt) {
         mbox->text = lv_label_create(mbox->content);
         lv_label_set_text(mbox->text, txt);
         lv_label_set_long_mode(mbox->text, LV_LABEL_LONG_WRAP);
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.c
index 4e2f9f7bc..4bba67611 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.c
@@ -52,7 +52,7 @@ static lv_opa_t lv_span_get_style_text_blend_mode(lv_obj_t * par, lv_span_t * sp
 static int32_t lv_span_get_style_text_decor(lv_obj_t * par, lv_span_t * span);
 
 static inline void span_text_check(const char ** text);
-static void lv_draw_span(lv_obj_t * spans, const lv_area_t * coords, const lv_area_t * mask);
+static void lv_draw_span(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx);
 static bool lv_txt_get_snippet(const char * txt, const lv_font_t * font, lv_coord_t letter_space,
                                lv_coord_t max_width, lv_text_flag_t flag, lv_coord_t * use_width,
                                uint32_t * end_ofs);
@@ -86,11 +86,6 @@ const lv_obj_class_t lv_spangroup_class  = {
  *   GLOBAL FUNCTIONS
  **********************/
 
-/**
- * Create a spangroup objects
- * @param par pointer to an object, it will be the parent of the new spangroup
- * @return pointer to the created spangroup
- */
 lv_obj_t * lv_spangroup_create(lv_obj_t * par)
 {
     lv_obj_t * obj = lv_obj_class_create_obj(&lv_spangroup_class, par);
@@ -98,11 +93,6 @@ lv_obj_t * lv_spangroup_create(lv_obj_t * par)
     return obj;
 }
 
-/**
- * Create a span string descriptor and add to spangroup.
- * @param obj pointer to a spangroup object.
- * @return pointer to the created span.
- */
 lv_span_t * lv_spangroup_new_span(lv_obj_t * obj)
 {
     if(obj == NULL) {
@@ -124,11 +114,6 @@ lv_span_t * lv_spangroup_new_span(lv_obj_t * obj)
     return span;
 }
 
-/**
- * Remove the span from the spangroup and free memory.
- * @param obj pointer to a spangroup object.
- * @param span pointer to a span.
- */
 void lv_spangroup_del_span(lv_obj_t * obj, lv_span_t * span)
 {
     if(obj == NULL || span == NULL) {
@@ -157,11 +142,6 @@ void lv_spangroup_del_span(lv_obj_t * obj, lv_span_t * span)
  * Setter functions
  *====================*/
 
-/**
- * Set a new text for a span. Memory will be allocated to store the text by the span.
- * @param span pointer to a span.
- * @param text pointer to a text.
- */
 void lv_span_set_text(lv_span_t * span, const char * text)
 {
     if(span == NULL || text == NULL) {
@@ -172,7 +152,7 @@ void lv_span_set_text(lv_span_t * span, const char * text)
         span->txt = lv_mem_alloc(strlen(text) + 1);
     }
     else {
-        lv_mem_realloc(span->txt, strlen(text) + 1);
+        span->txt = lv_mem_realloc(span->txt, strlen(text) + 1);
     }
     span->static_flag = 0;
     strcpy(span->txt, text);
@@ -180,12 +160,6 @@ void lv_span_set_text(lv_span_t * span, const char * text)
     refresh_self_size(span->spangroup);
 }
 
-/**
- * Set a static text. It will not be saved by the span so the 'text' variable
- * has to be 'alive' while the span exist.
- * @param span pointer to a span.
- * @param text pointer to a text.
- */
 void lv_span_set_text_static(lv_span_t * span, const char * text)
 {
     if(span == NULL || text == NULL) {
@@ -201,21 +175,11 @@ void lv_span_set_text_static(lv_span_t * span, const char * text)
     refresh_self_size(span->spangroup);
 }
 
-/**
- * Set the align of the spangroup.
- * @param obj pointer to a spangroup object.
- * @param align see lv_text_align_t for details.
- */
 void lv_spangroup_set_align(lv_obj_t * obj, lv_text_align_t align)
 {
     lv_obj_set_style_text_align(obj, align, LV_PART_MAIN);
 }
 
-/**
- * Set the overflow of the spangroup.
- * @param obj pointer to a spangroup object.
- * @param overflow see lv_span_overflow_t for details.
- */
 void lv_spangroup_set_overflow(lv_obj_t * obj, lv_span_overflow_t overflow)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -226,12 +190,6 @@ void lv_spangroup_set_overflow(lv_obj_t * obj, lv_span_overflow_t overflow)
     lv_obj_invalidate(obj);
 }
 
-/**
- * Set the indent of the spangroup.
- * @param obj pointer to a spangroup object.
- * @param indent The first line indentation, support percent
- *               for LV_SPAN_MODE_FIXED and LV_SPAN_MODE_BREAK mode.
- */
 void lv_spangroup_set_indent(lv_obj_t * obj, lv_coord_t indent)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -243,11 +201,6 @@ void lv_spangroup_set_indent(lv_obj_t * obj, lv_coord_t indent)
     refresh_self_size(obj);
 }
 
-/**
- * Set the mode of the spangroup.
- * @param obj pointer to a spangroup object.
- * @param mode see lv_span_mode_t for details.
- */
 void lv_spangroup_set_mode(lv_obj_t * obj, lv_span_mode_t mode)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -260,18 +213,6 @@ void lv_spangroup_set_mode(lv_obj_t * obj, lv_span_mode_t mode)
  * Getter functions
  *====================*/
 
-/**
- * Get a spangroup child by its index.
- *
- * @param obj   The spangroup object
- * @param id    the index of the child.
- *              0: the oldest (firstly created) child
- *              1: the second oldest
- *              child count-1: the youngest
- *              -1: the youngest
- *              -2: the second youngest
- * @return      The child span at index `id`, or NULL if the ID does not exist
- */
 lv_span_t * lv_spangroup_get_child(const lv_obj_t * obj, int32_t id)
 {
     if(obj == NULL) {
@@ -309,11 +250,6 @@ lv_span_t * lv_spangroup_get_child(const lv_obj_t * obj, int32_t id)
     return NULL;
 }
 
-/**
- *
- * @param obj   The spangroup object to get the child count of.
- * @return      The span count of the spangroup.
- */
 uint32_t lv_spangroup_get_child_cnt(const lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -327,21 +263,11 @@ uint32_t lv_spangroup_get_child_cnt(const lv_obj_t * obj)
     return _lv_ll_get_len(&(spans->child_ll));
 }
 
-/**
- * get the align of the spangroup.
- * @param obj pointer to a spangroup object.
- * @return the align value.
- */
 lv_text_align_t lv_spangroup_get_align(lv_obj_t * obj)
 {
     return lv_obj_get_style_text_align(obj, LV_PART_MAIN);
 }
 
-/**
- * get the overflow of the spangroup.
- * @param obj pointer to a spangroup object.
- * @return the overflow value.
- */
 lv_span_overflow_t lv_spangroup_get_overflow(lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -349,11 +275,6 @@ lv_span_overflow_t lv_spangroup_get_overflow(lv_obj_t * obj)
     return spans->overflow;
 }
 
-/**
- * get the indent of the spangroup.
- * @param obj pointer to a spangroup object.
- * @return the indent value.
- */
 lv_coord_t lv_spangroup_get_indent(lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -361,11 +282,6 @@ lv_coord_t lv_spangroup_get_indent(lv_obj_t * obj)
     return spans->indent;
 }
 
-/**
- * Set the mode of the spangroup.
- * @param obj pointer to a spangroup object.
- * @return the mode value.
- */
 lv_span_mode_t lv_spangroup_get_mode(lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -373,10 +289,6 @@ lv_span_mode_t lv_spangroup_get_mode(lv_obj_t * obj)
     return spans->mode;
 }
 
-/**
- * update the mode of the spangroup.
- * @param obj pointer to a spangroup object.
- */
 void lv_spangroup_refr_mode(lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -411,10 +323,6 @@ void lv_spangroup_refr_mode(lv_obj_t * obj)
     refresh_self_size(obj);
 }
 
-/**
- * get max line height of all span in the spangroup.
- * @param obj pointer to a spangroup object.
- */
 lv_coord_t lv_spangroup_get_max_line_h(lv_obj_t * obj)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -433,11 +341,7 @@ lv_coord_t lv_spangroup_get_max_line_h(lv_obj_t * obj)
     return max_line_h;
 }
 
-/**
- * get the width when all span of spangroup on a line. not included spangroup pad, border width.
- * @param obj pointer to a spangroup object.
- */
-lv_coord_t lv_spangroup_get_expand_width(lv_obj_t * obj)
+uint32_t lv_spangroup_get_expand_width(lv_obj_t * obj, uint32_t max_width)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
     lv_spangroup_t * spans = (lv_spangroup_t *)obj;
@@ -446,7 +350,7 @@ lv_coord_t lv_spangroup_get_expand_width(lv_obj_t * obj)
         return 0;
     }
 
-    lv_coord_t width = LV_COORD_IS_PCT(spans->indent) ? 0 : spans->indent;
+    uint32_t width = LV_COORD_IS_PCT(spans->indent) ? 0 : spans->indent;
     lv_span_t * cur_span;
     lv_coord_t letter_space = 0;
     _LV_LL_READ(&spans->child_ll, cur_span) {
@@ -456,9 +360,12 @@ lv_coord_t lv_spangroup_get_expand_width(lv_obj_t * obj)
         const char * cur_txt = cur_span->txt;
         span_text_check(&cur_txt);
         while(cur_txt[j] != '\0') {
+            if(max_width > 0 && width >= max_width) {
+                return max_width;
+            }
             uint32_t letter      = _lv_txt_encoded_next(cur_txt, &j);
             uint32_t letter_next = _lv_txt_encoded_next(&cur_txt[j], NULL);
-            int32_t letter_w = lv_font_get_glyph_width(font, letter, letter_next);
+            uint16_t letter_w = lv_font_get_glyph_width(font, letter, letter_next);
             width = width + letter_w + letter_space;
         }
     }
@@ -466,10 +373,6 @@ lv_coord_t lv_spangroup_get_expand_width(lv_obj_t * obj)
     return width - letter_space;
 }
 
-/**
- * get the height with width fixed. Height and width are not included spangroup pad, border width.
- * @param obj pointer to a spangroup object.
- */
 lv_coord_t lv_spangroup_get_expand_height(lv_obj_t * obj, lv_coord_t width)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
@@ -531,9 +434,15 @@ lv_coord_t lv_spangroup_get_expand_height(lv_obj_t * obj, lv_coord_t width)
 
             /* break word deal width */
             if(isfill && next_ofs > 0 && snippet_cnt > 0) {
-                uint32_t letter = (uint32_t)cur_txt[cur_txt_ofs + next_ofs - 1];
+                if(max_w < use_width) {
+                    break;
+                }
+
+                uint32_t tmp_ofs = next_ofs;
+                uint32_t letter = _lv_txt_encoded_prev(&cur_txt[cur_txt_ofs], &tmp_ofs);
                 if(!(letter == '\0' || letter == '\n' || letter == '\r' || _lv_txt_is_break_char(letter))) {
-                    letter = (uint32_t)cur_txt[cur_txt_ofs + next_ofs];
+                    tmp_ofs = 0;
+                    letter = _lv_txt_encoded_next(&cur_txt[cur_txt_ofs + next_ofs], &tmp_ofs);
                     if(!(letter == '\0' || letter == '\n'  || letter == '\r' || _lv_txt_is_break_char(letter))) {
                         break;
                     }
@@ -548,10 +457,10 @@ lv_coord_t lv_spangroup_get_expand_height(lv_obj_t * obj, lv_coord_t width)
                 max_line_h = snippet.line_h;
             }
             snippet_cnt ++;
-            if(isfill) {
+            max_w = max_w - use_width - snippet.letter_space;
+            if(isfill  || max_w <= 0) {
                 break;
             }
-            max_w -= use_width;
         }
 
         /* next line init */
@@ -624,7 +533,7 @@ static void lv_spangroup_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
         if(spans->mode == LV_SPAN_MODE_EXPAND) {
             if(spans->refresh) {
-                spans->cache_w = lv_spangroup_get_expand_width(obj);
+                spans->cache_w = (lv_coord_t)lv_spangroup_get_expand_width(obj, 0);
                 spans->cache_h = lv_spangroup_get_max_line_h(obj);
                 spans->refresh = 0;
             }
@@ -657,12 +566,9 @@ static void lv_spangroup_event(const lv_obj_class_t * class_p, lv_event_t * e)
 static void draw_main(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
-    lv_area_t txt_coords;
-    lv_obj_get_content_coords(obj, &txt_coords);
-
-    lv_draw_span(obj, &txt_coords, clip_area);
+    lv_draw_span(obj, draw_ctx);
 }
 
 /**
@@ -678,12 +584,10 @@ static bool lv_txt_get_snippet(const char * txt, const lv_font_t * font,
         return false;
     }
 
-    uint32_t ofs = _lv_txt_get_next_line(txt, font, letter_space, max_width, flag);
-    lv_coord_t width = lv_txt_get_width(txt, ofs, font, letter_space, flag);
+    uint32_t ofs = _lv_txt_get_next_line(txt, font, letter_space, max_width, use_width, flag);
     *end_ofs = ofs;
-    *use_width = width;
 
-    if(txt[ofs] == '\0' && width < max_width) {
+    if(txt[ofs] == '\0' && *use_width < max_width) {
         return false;
     }
     else {
@@ -828,12 +732,11 @@ static lv_coord_t convert_indent_pct(lv_obj_t * obj, lv_coord_t width)
  * @param coords coordinates of the label
  * @param mask the label will be drawn only in this area
  */
-static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area_t * mask)
+static void lv_draw_span(lv_obj_t * obj, lv_draw_ctx_t * draw_ctx)
 {
-    /* return if no draw area */
-    lv_area_t clipped_area;
-    bool clip_ok = _lv_area_intersect(&clipped_area, coords, mask);
-    if(!clip_ok) return;
+
+    lv_area_t coords;
+    lv_obj_get_content_coords(obj, &coords);
 
     lv_spangroup_t * spans = (lv_spangroup_t *)obj;
 
@@ -842,25 +745,34 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
         return;
     }
 
+    /* return if no draw area */
+    lv_area_t clip_area;
+    if(!_lv_area_intersect(&clip_area, &coords, draw_ctx->clip_area))  return;
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
+
     /* init draw variable */
     lv_text_flag_t txt_flag = LV_TEXT_FLAG_NONE;
     lv_coord_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN);;
-    lv_coord_t max_width = lv_area_get_width(coords);
+    lv_coord_t max_width = lv_area_get_width(&coords);
     lv_coord_t indent = convert_indent_pct(obj, max_width);
     lv_coord_t max_w  = max_width - indent; /* first line need minus indent */
     lv_opa_t obj_opa = lv_obj_get_style_opa(obj, LV_PART_MAIN);
 
     /* coords of draw span-txt */
     lv_point_t txt_pos;
-    txt_pos.y = coords->y1;
-    txt_pos.x = coords->x1 + indent; /* first line need add indent */
+    txt_pos.y = coords.y1;
+    txt_pos.x = coords.x1 + indent; /* first line need add indent */
 
     lv_span_t * cur_span = _lv_ll_get_head(&spans->child_ll);
     const char * cur_txt = cur_span->txt;
     span_text_check(&cur_txt);
     uint32_t cur_txt_ofs = 0;
     lv_snippet_t snippet;   /* use to save cur_span info and push it to stack */
-    memset(&snippet, 0, sizeof(snippet));
+    lv_memset_00(&snippet, sizeof(snippet));
+
+    lv_draw_label_dsc_t label_draw_dsc;
+    lv_draw_label_dsc_init(&label_draw_dsc);
 
     bool is_first_line = true;
     /* the loop control how many lines need to draw */
@@ -893,7 +805,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
 
             if(spans->overflow == LV_SPAN_OVERFLOW_ELLIPSIS) {
                 /* curretn line span txt overflow, don't push */
-                if(txt_pos.y + snippet.line_h - line_space > coords->y2 + 1) {
+                if(txt_pos.y + snippet.line_h - line_space > coords.y2 + 1) {
                     ellipsis_valid = true;
                     is_end_line = true;
                     break;
@@ -916,7 +828,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                     }
                 }
                 lv_coord_t cur_line_h = max_line_h < snippet.line_h ? snippet.line_h : max_line_h;
-                if(txt_pos.y + cur_line_h + next_line_h - line_space > coords->y2 + 1) { /* for overflow if is end line. */
+                if(txt_pos.y + cur_line_h + next_line_h - line_space > coords.y2 + 1) { /* for overflow if is end line. */
                     if(cur_txt[cur_txt_ofs + next_ofs] != '\0') {
                         next_ofs = strlen(&cur_txt[cur_txt_ofs]);
                         use_width = lv_txt_get_width(&cur_txt[cur_txt_ofs], next_ofs, snippet.font, snippet.letter_space, txt_flag);
@@ -925,10 +837,16 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                     }
                 }
                 else if(next_ofs > 0 && lv_get_snippet_cnt() > 0) {
-                    /* break word deal width */
-                    uint32_t letter = (uint32_t)cur_txt[cur_txt_ofs + next_ofs - 1];
+                    /* To prevent infinite loops, the _lv_txt_get_next_line() may return incomplete words, */
+                    /* This phenomenon should be avoided when lv_get_snippet_cnt() > 0 */
+                    if(max_w < use_width) {
+                        break;
+                    }
+                    uint32_t tmp_ofs = next_ofs;
+                    uint32_t letter = _lv_txt_encoded_prev(&cur_txt[cur_txt_ofs], &tmp_ofs);
                     if(!(letter == '\0' || letter == '\n' || letter == '\r' || _lv_txt_is_break_char(letter))) {
-                        letter = (uint32_t)cur_txt[cur_txt_ofs + next_ofs];
+                        tmp_ofs = 0;
+                        letter = _lv_txt_encoded_next(&cur_txt[cur_txt_ofs + next_ofs], &tmp_ofs);
                         if(!(letter == '\0' || letter == '\n'  || letter == '\r' || _lv_txt_is_break_char(letter))) {
                             break;
                         }
@@ -959,13 +877,13 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
         }
 
         /*Go the first visible line*/
-        if(txt_pos.y + max_line_h < mask->y1) {
+        if(txt_pos.y + max_line_h < clip_area.y1) {
             goto Next_line_init;
         }
 
         /* align deal with */
         lv_text_align_t align = lv_obj_get_style_text_align(obj, LV_PART_MAIN);
-        if(align != LV_TEXT_ALIGN_LEFT) {
+        if(align == LV_TEXT_ALIGN_CENTER || align == LV_TEXT_ALIGN_RIGHT) {
             lv_coord_t align_ofs = 0;
             lv_coord_t txts_w = is_first_line ? indent : 0;
             for(int i = 0; i < item_cnt; i++) {
@@ -981,7 +899,8 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
         }
 
         /* draw line letters */
-        for(int i = 0; i < item_cnt; i++) {
+        int i;
+        for(i = 0; i < item_cnt; i++) {
             lv_snippet_t * pinfo = lv_get_snippet(i);
 
             /* bidi deal with:todo */
@@ -990,12 +909,13 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
             lv_point_t pos;
             pos.x = txt_pos.x;
             pos.y = txt_pos.y + max_line_h - pinfo->line_h;
-            lv_color_t letter_color = lv_span_get_style_text_color(obj, pinfo->span);
-            lv_opa_t letter_opa = lv_span_get_style_text_opa(obj, pinfo->span);
+            label_draw_dsc.color = lv_span_get_style_text_color(obj, pinfo->span);
+            label_draw_dsc.opa = lv_span_get_style_text_opa(obj, pinfo->span);
+            label_draw_dsc.font = lv_span_get_style_text_font(obj, pinfo->span);
+            label_draw_dsc.blend_mode = lv_span_get_style_text_blend_mode(obj, pinfo->span);
             if(obj_opa < LV_OPA_MAX) {
-                letter_opa = (uint16_t)((uint16_t)letter_opa * obj_opa) >> 8;
+                label_draw_dsc.opa = (uint16_t)((uint16_t)label_draw_dsc.opa * obj_opa) >> 8;
             }
-            lv_blend_mode_t blend_mode = lv_span_get_style_text_blend_mode(obj, pinfo->span);
             uint32_t txt_bytes = pinfo->bytes;
 
             /* overflow */
@@ -1005,12 +925,12 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                 dot_letter_w = lv_font_get_glyph_width(pinfo->font, '.', '.');
                 dot_width = dot_letter_w * 3;
             }
-            lv_coord_t ellipsis_width = coords->x1 + max_width - dot_width;
+            lv_coord_t ellipsis_width = coords.x1 + max_width - dot_width;
 
             uint32_t j = 0;
             while(j < txt_bytes) {
                 /* skip invalid fields */
-                if(pos.x > clipped_area.x2) {
+                if(pos.x > clip_area.x2) {
                     break;
                 }
                 uint32_t letter      = _lv_txt_encoded_next(bidi_txt, &j);
@@ -1018,7 +938,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                 int32_t letter_w = lv_font_get_glyph_width(pinfo->font, letter, letter_next);
 
                 /* skip invalid fields */
-                if(pos.x + letter_w + pinfo->letter_space < clipped_area.x1) {
+                if(pos.x + letter_w + pinfo->letter_space < clip_area.x1) {
                     if(letter_w > 0) {
                         pos.x = pos.x + letter_w + pinfo->letter_space;
                     }
@@ -1027,7 +947,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
 
                 if(ellipsis_valid && pos.x + letter_w + pinfo->letter_space > ellipsis_width) {
                     for(int ell = 0; ell < 3; ell++) {
-                        lv_draw_letter(&pos, &clipped_area, pinfo->font, '.', letter_color, letter_opa, blend_mode);
+                        lv_draw_letter(draw_ctx, &label_draw_dsc, &pos, '.');
                         pos.x = pos.x + dot_letter_w + pinfo->letter_space;
                     }
                     if(pos.x <= ellipsis_width) {
@@ -1036,7 +956,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                     break;
                 }
                 else {
-                    lv_draw_letter(&pos, &clipped_area, pinfo->font, letter, letter_color, letter_opa, blend_mode);
+                    lv_draw_letter(draw_ctx, &label_draw_dsc, &pos, letter);
                     if(letter_w > 0) {
                         pos.x = pos.x + letter_w + pinfo->letter_space;
                     }
@@ -1045,7 +965,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
 
             if(ellipsis_valid && i == item_cnt - 1 && pos.x <= ellipsis_width) {
                 for(int ell = 0; ell < 3; ell++) {
-                    lv_draw_letter(&pos, &clipped_area, pinfo->font, '.', letter_color, letter_opa, blend_mode);
+                    lv_draw_letter(draw_ctx, &label_draw_dsc, &pos, '.');
                     pos.x = pos.x + dot_letter_w + pinfo->letter_space;
                 }
             }
@@ -1055,10 +975,10 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
             if(decor != LV_TEXT_DECOR_NONE) {
                 lv_draw_line_dsc_t line_dsc;
                 lv_draw_line_dsc_init(&line_dsc);
-                line_dsc.color = letter_color;
-                line_dsc.width = pinfo->font->underline_thickness ? pinfo->font->underline_thickness : 1;
-                line_dsc.opa = letter_opa;
-                line_dsc.blend_mode = blend_mode;
+                line_dsc.color = label_draw_dsc.color;
+                line_dsc.width = label_draw_dsc.font->underline_thickness ? pinfo->font->underline_thickness : 1;
+                line_dsc.opa = label_draw_dsc.opa;
+                line_dsc.blend_mode = label_draw_dsc.blend_mode;
 
                 if(decor & LV_TEXT_DECOR_STRIKETHROUGH) {
                     lv_point_t p1;
@@ -1067,7 +987,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                     p1.y = pos.y + ((pinfo->line_h - line_space) >> 1)  + (line_dsc.width >> 1);
                     p2.x = pos.x;
                     p2.y = p1.y;
-                    lv_draw_line(&p1, &p2, mask, &line_dsc);
+                    lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
                 }
 
                 if(decor & LV_TEXT_DECOR_UNDERLINE) {
@@ -1077,7 +997,7 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
                     p1.y = pos.y + pinfo->line_h - line_space - pinfo->font->base_line - pinfo->font->underline_position;
                     p2.x = pos.x;
                     p2.y = p1.y;
-                    lv_draw_line(&p1, &p2, &clipped_area, &line_dsc);
+                    lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
                 }
             }
             txt_pos.x = pos.x;
@@ -1086,13 +1006,15 @@ static void lv_draw_span(lv_obj_t * obj, const lv_area_t * coords, const lv_area
 Next_line_init:
         /* next line init */
         is_first_line = false;
-        txt_pos.x = coords->x1;
+        txt_pos.x = coords.x1;
         txt_pos.y += max_line_h;
-        if(is_end_line || txt_pos.y > clipped_area.y2 + 1) {
+        if(is_end_line || txt_pos.y > clip_area.y2 + 1) {
+            draw_ctx->clip_area = clip_area_ori;
             return;
         }
         max_w = max_width;
     }
+    draw_ctx->clip_area = clip_area_ori;
 }
 
 static void refresh_self_size(lv_obj_t * obj)
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.h
index c130465ea..418ad87e2 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.h
@@ -66,7 +66,7 @@ extern const lv_obj_class_t lv_spangroup_class;
  **********************/
 
 /**
- * Create a spangroup objects
+ * Create a spangroup object
  * @param par pointer to an object, it will be the parent of the new spangroup
  * @return pointer to the created spangroup
  */
@@ -192,13 +192,16 @@ lv_span_mode_t lv_spangroup_get_mode(lv_obj_t * obj);
 lv_coord_t lv_spangroup_get_max_line_h(lv_obj_t * obj);
 
 /**
- * get the width when all span of spangroup on a line. include spangroup pad.
+ * get the text content width when all span of spangroup on a line.
  * @param obj pointer to a spangroup object.
+ * @param max_width if text content width >= max_width, return max_width
+ * to reduce computation, if max_width == 0, returns the text content width.
+ * @return text content width or max_width.
  */
-lv_coord_t lv_spangroup_get_expand_width(lv_obj_t * obj);
+uint32_t lv_spangroup_get_expand_width(lv_obj_t * obj, uint32_t max_width);
 
 /**
- * get the height with width fixed. the height include spangroup pad.
+ * get the text content height with width fixed.
  * @param obj pointer to a spangroup object.
  */
 lv_coord_t lv_spangroup_get_expand_height(lv_obj_t * obj, lv_coord_t width);
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.c
index 97d00404e..72aca7db8 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.c
@@ -60,7 +60,7 @@ lv_obj_t * lv_spinbox_create(lv_obj_t * parent)
 
 /**
  * Set spinbox value
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param i value to be set
  */
 void lv_spinbox_set_value(lv_obj_t * obj, int32_t i)
@@ -175,7 +175,7 @@ void lv_spinbox_set_pos(lv_obj_t * obj, uint8_t pos)
  * @param spinbox pointer to spinbox
  * @param direction the direction (LV_DIR_RIGHT or LV_DIR_LEFT)
  */
-void lv_spinbox_set_digit_step_direction(lv_obj_t *obj, lv_dir_t direction)
+void lv_spinbox_set_digit_step_direction(lv_obj_t * obj, lv_dir_t direction)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
     lv_spinbox_t * spinbox = (lv_spinbox_t *)obj;
@@ -189,7 +189,7 @@ void lv_spinbox_set_digit_step_direction(lv_obj_t *obj, lv_dir_t direction)
 
 /**
  * Get the spinbox numeral value (user has to convert to float according to its digit format)
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @return value integer value of the spinbox
  */
 int32_t lv_spinbox_get_value(lv_obj_t * obj)
@@ -201,7 +201,7 @@ int32_t lv_spinbox_get_value(lv_obj_t * obj)
 }
 /**
  * Get the spinbox step value (user has to convert to float according to its digit format)
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @return value integer step value of the spinbox
  */
 int32_t lv_spinbox_get_step(lv_obj_t * obj)
@@ -218,7 +218,7 @@ int32_t lv_spinbox_get_step(lv_obj_t * obj)
 
 /**
  * Select next lower digit for edition
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_step_next(lv_obj_t * obj)
 {
@@ -236,7 +236,7 @@ void lv_spinbox_step_next(lv_obj_t * obj)
 
 /**
  * Select next higher digit for edition
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_step_prev(lv_obj_t * obj)
 {
@@ -252,7 +252,7 @@ void lv_spinbox_step_prev(lv_obj_t * obj)
 
 /**
  * Get spinbox rollover function status
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 bool lv_spinbox_get_rollover(lv_obj_t * obj)
 {
@@ -264,7 +264,7 @@ bool lv_spinbox_get_rollover(lv_obj_t * obj)
 
 /**
  * Increment spinbox value by one step
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_increment(lv_obj_t * obj)
 {
@@ -290,7 +290,7 @@ void lv_spinbox_increment(lv_obj_t * obj)
 
 /**
  * Decrement spinbox value by one step
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_decrement(lv_obj_t * obj)
 {
@@ -360,10 +360,10 @@ static void lv_spinbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
         lv_indev_t * indev = lv_indev_get_act();
         if(lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) {
             if(lv_group_get_editing(lv_obj_get_group(obj))) {
-                if (spinbox->digit_count > 1) {
-                    if (spinbox->digit_step_dir == LV_DIR_RIGHT) {
+                if(spinbox->digit_count > 1) {
+                    if(spinbox->digit_step_dir == LV_DIR_RIGHT) {
                         if(spinbox->step > 1) {
-                           lv_spinbox_step_next(obj);
+                            lv_spinbox_step_next(obj);
                         }
                         else {
                             /*Restart from the MSB*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.h
index 71856c917..14c73ba36 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.h
@@ -52,8 +52,8 @@ extern const lv_obj_class_t lv_spinbox_class;
  **********************/
 
 /**
- * Create a spinbox objects
- * @param par pointer to an object, it will be the parent of the new spinbox
+ * Create a Spinbox object
+ * @param parent pointer to an object, it will be the parent of the new spinbox
  * @return pointer to the created spinbox
  */
 lv_obj_t * lv_spinbox_create(lv_obj_t * parent);
@@ -64,21 +64,21 @@ lv_obj_t * lv_spinbox_create(lv_obj_t * parent);
 
 /**
  * Set spinbox value
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param i value to be set
  */
 void lv_spinbox_set_value(lv_obj_t * obj, int32_t i);
 
 /**
  * Set spinbox rollover function
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param b true or false to enable or disable (default)
  */
 void lv_spinbox_set_rollover(lv_obj_t * obj, bool b);
 
 /**
  * Set spinbox digit format (digit count and decimal format)
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param digit_count number of digit excluding the decimal separator and the sign
  * @param separator_position number of digit before the decimal point. If 0, decimal point is not
  * shown
@@ -87,14 +87,14 @@ void lv_spinbox_set_digit_format(lv_obj_t * obj, uint8_t digit_count, uint8_t se
 
 /**
  * Set spinbox step
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param step steps on increment/decrement. Can be 1, 10, 100, 1000, etc the digit that will change.
  */
 void lv_spinbox_set_step(lv_obj_t * obj, uint32_t step);
 
 /**
  * Set spinbox value range
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param range_min maximum value, inclusive
  * @param range_max minimum value, inclusive
  */
@@ -102,14 +102,14 @@ void lv_spinbox_set_range(lv_obj_t * obj, int32_t range_min, int32_t range_max);
 
 /**
  * Set cursor position to a specific digit for edition
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param pos selected position in spinbox
  */
 void lv_spinbox_set_pos(lv_obj_t * obj, uint8_t pos);
 
 /**
  * Set direction of digit step when clicking an encoder button while in editing mode
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @param direction the direction (LV_DIR_RIGHT or LV_DIR_LEFT)
  */
 void lv_spinbox_set_digit_step_direction(lv_obj_t * obj, lv_dir_t direction);
@@ -120,20 +120,20 @@ void lv_spinbox_set_digit_step_direction(lv_obj_t * obj, lv_dir_t direction);
 
 /**
  * Get spinbox rollover function status
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
-bool lv_spinbox_get_rollover(lv_obj_t *obj);
+bool lv_spinbox_get_rollover(lv_obj_t * obj);
 
 /**
  * Get the spinbox numeral value (user has to convert to float according to its digit format)
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @return value integer value of the spinbox
  */
 int32_t lv_spinbox_get_value(lv_obj_t * obj);
 
 /**
  * Get the spinbox step value (user has to convert to float according to its digit format)
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  * @return value integer step value of the spinbox
  */
 int32_t lv_spinbox_get_step(lv_obj_t * obj);
@@ -144,25 +144,25 @@ int32_t lv_spinbox_get_step(lv_obj_t * obj);
 
 /**
  * Select next lower digit for edition by dividing the step by 10
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_step_next(lv_obj_t * obj);
 
 /**
  * Select next higher digit for edition by multiplying the step by 10
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_step_prev(lv_obj_t * obj);
 
 /**
  * Increment spinbox value by one step
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_increment(lv_obj_t * obj);
 
 /**
  * Decrement spinbox value by one step
- * @param spinbox pointer to spinbox
+ * @param obj pointer to spinbox
  */
 void lv_spinbox_decrement(lv_obj_t * obj);
 
@@ -175,4 +175,4 @@ void lv_spinbox_decrement(lv_obj_t * obj);
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
-#endif /*LV_USE_SPINBOX*/
+#endif /*LV_SPINBOX_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.c
index 65b6b046a..6fc6d7421 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.c
@@ -45,7 +45,7 @@ static uint32_t arc_length_param;
 
 /**
  * Create a spinner object
- * @param par pointer to an object, it will be the parent of the new spinner
+ * @param parent pointer to an object, it will be the parent of the new spinner
  * @return pointer to the created spinner
  */
 lv_obj_t * lv_spinner_create(lv_obj_t * parent, uint32_t time, uint32_t arc_length)
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.c
index 8f8f3c4d2..4f98b552a 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.c
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.c
@@ -89,6 +89,8 @@ void lv_obj_set_tile(lv_obj_t * obj, lv_obj_t * tile_obj, lv_anim_enable_t anim_
 
 void lv_obj_set_tile_id(lv_obj_t * tv, uint32_t col_id, uint32_t row_id, lv_anim_enable_t anim_en)
 {
+    lv_obj_update_layout(tv);
+
     lv_coord_t w = lv_obj_get_content_width(tv);
     lv_coord_t h = lv_obj_get_content_height(tv);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.h
index 172338196..7adeec333 100644
--- a/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.h
+++ b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.h
@@ -42,13 +42,13 @@ extern const lv_obj_class_t lv_tileview_tile_class;
  **********************/
 
 /**
- * Create a tileview objects
- * @param par pointer to an object, it will be the parent of the new tileview
+ * Create a Tileview object
+ * @param parent pointer to an object, it will be the parent of the new tileview
  * @return pointer to the created tileview
  */
 lv_obj_t * lv_tileview_create(lv_obj_t * parent);
 
-lv_obj_t * lv_tileview_add_tile(lv_obj_t * tv, uint8_t row_id, uint8_t col_id, lv_dir_t dir);
+lv_obj_t * lv_tileview_add_tile(lv_obj_t * tv, uint8_t col_id, uint8_t row_id, lv_dir_t dir);
 
 void lv_obj_set_tile(lv_obj_t * tv, lv_obj_t * tile_obj, lv_anim_enable_t anim_en);
 void lv_obj_set_tile_id(lv_obj_t * tv, uint32_t col_id, uint32_t row_id, lv_anim_enable_t anim_en);
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font.c
index cf3d374f4..0e7a2fe74 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font.c
@@ -57,6 +57,7 @@ const uint8_t * lv_font_get_glyph_bitmap(const lv_font_t * font_p, uint32_t lett
  * @param font_p pointer to font
  * @param dsc_out store the result descriptor here
  * @param letter an UNICODE letter code
+ * @param letter_next the next letter after `letter`. Used for kerning
  * @return true: descriptor is successfully loaded into `dsc_out`.
  *         false: the letter was not found, no data is loaded to `dsc_out`
  */
@@ -64,7 +65,19 @@ bool lv_font_get_glyph_dsc(const lv_font_t * font_p, lv_font_glyph_dsc_t * dsc_o
                            uint32_t letter_next)
 {
     LV_ASSERT_NULL(font_p);
-    return font_p->get_glyph_dsc(font_p, dsc_out, letter, letter_next);
+    LV_ASSERT_NULL(dsc_out);
+    dsc_out->resolved_font = NULL;
+    const lv_font_t * f = font_p;
+    bool found = false;
+    while(f) {
+        found = f->get_glyph_dsc(f, dsc_out, letter, letter_next);
+        if(found && !dsc_out->is_placeholder) {
+            dsc_out->resolved_font = f;
+            break;
+        }
+        f = f->fallback;
+    }
+    return found;
 }
 
 /**
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font.h b/lib/libesp32_lvgl/lvgl/src/font/lv_font.h
index b68f5b9a0..3d716dd46 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font.h
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font.h
@@ -33,14 +33,18 @@ extern "C" {
  * General types
  *-----------------*/
 
+struct _lv_font_t;
 /** Describes the properties of a glyph.*/
 typedef struct {
+    const struct _lv_font_t *
+        resolved_font; /**< Pointer to a font where the gylph was actually found after handling fallbacks*/
     uint16_t adv_w; /**< The glyph needs this space. Draw the next glyph after this width.*/
-    uint16_t box_w;  /**< Width of the glyph's bounding box*/
-    uint16_t box_h;  /**< Height of the glyph's bounding box*/
-    int16_t ofs_x;   /**< x offset of the bounding box*/
+    uint16_t box_w; /**< Width of the glyph's bounding box*/
+    uint16_t box_h; /**< Height of the glyph's bounding box*/
+    int16_t ofs_x;  /**< x offset of the bounding box*/
     int16_t ofs_y;  /**< y offset of the bounding box*/
-    uint8_t bpp;   /**< Bit-per-pixel: 1, 2, 4, 8*/
+    uint8_t bpp: 4;  /**< Bit-per-pixel: 1, 2, 4, 8*/
+    uint8_t is_placeholder: 1; /** Glyph is missing. But placeholder will still be displayed */
 } lv_font_glyph_dsc_t;
 
 /** The bitmaps might be upscaled by 3 to achieve subpixel rendering.*/
@@ -53,8 +57,6 @@ enum {
 
 typedef uint8_t lv_font_subpx_t;
 
-struct _lv_font_t;
-
 /** Describe the properties of a font*/
 typedef struct _lv_font_t {
     /** Get a glyph's descriptor from a font*/
@@ -71,11 +73,11 @@ typedef struct _lv_font_t {
     int8_t underline_position;      /**< Distance between the top of the underline and base line (< 0 means below the base line)*/
     int8_t underline_thickness;     /**< Thickness of the underline*/
 
-    const void * dsc;                     /**< Store implementation specific or run_time data or caching here*/
+    const void * dsc;               /**< Store implementation specific or run_time data or caching here*/
+    const struct _lv_font_t * fallback;   /**< Fallback font for missing glyph. Resolved recursively */
 #if LV_USE_USER_DATA
     void * user_data;               /**< Custom user data for font.*/
 #endif
-
 } lv_font_t;
 
 /**********************
@@ -95,6 +97,7 @@ const uint8_t * lv_font_get_glyph_bitmap(const lv_font_t * font_p, uint32_t lett
  * @param font_p pointer to font
  * @param dsc_out store the result descriptor here
  * @param letter an UNICODE letter code
+ * @param letter_next the next letter after `letter`. Used for kerning
  * @return true: descriptor is successfully loaded into `dsc_out`.
  *         false: the letter was not found, no data is loaded to `dsc_out`
  */
@@ -210,20 +213,12 @@ LV_FONT_DECLARE(lv_font_montserrat_46)
 LV_FONT_DECLARE(lv_font_montserrat_48)
 #endif
 
-#if LV_FONT_MONTSERRAT_28_COMPRESSED
-LV_FONT_DECLARE(lv_font_montserrat_28_compressed)
-#endif
-
 #if LV_FONT_MONTSERRAT_12_SUBPX
 LV_FONT_DECLARE(lv_font_montserrat_12_subpx)
 #endif
 
-#if LV_FONT_UNSCII_8
-LV_FONT_DECLARE(lv_font_unscii_8)
-#endif
-
-#if LV_FONT_UNSCII_16
-LV_FONT_DECLARE(lv_font_unscii_16)
+#if LV_FONT_MONTSERRAT_28_COMPRESSED
+LV_FONT_DECLARE(lv_font_montserrat_28_compressed)
 #endif
 
 #if LV_FONT_DEJAVU_16_PERSIAN_HEBREW
@@ -234,6 +229,14 @@ LV_FONT_DECLARE(lv_font_dejavu_16_persian_hebrew)
 LV_FONT_DECLARE(lv_font_simsun_16_cjk)
 #endif
 
+#if LV_FONT_UNSCII_8
+LV_FONT_DECLARE(lv_font_unscii_8)
+#endif
+
+#if LV_FONT_UNSCII_16
+LV_FONT_DECLARE(lv_font_unscii_16)
+#endif
+
 /*Declare the custom (user defined) fonts*/
 #ifdef LV_FONT_CUSTOM_DECLARE
 LV_FONT_CUSTOM_DECLARE
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_dejavu_16_persian_hebrew.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_dejavu_16_persian_hebrew.c
index 6d7ebde59..fce6b0ccf 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_dejavu_16_persian_hebrew.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_dejavu_16_persian_hebrew.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_DEJAVU_16_PERSIAN_HEBREW
-#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 1
+    #define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 1
 #endif
 
 #if LV_FONT_DEJAVU_16_PERSIAN_HEBREW
@@ -6505,8 +6505,7 @@ static const uint16_t unicode_list_9[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -6602,7 +6601,7 @@ lv_font_t lv_font_dejavu_16_persian_hebrew = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.c
index 991b23e6d..452cbe912 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.c
@@ -182,6 +182,7 @@ bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t *
     dsc_out->ofs_x = gdsc->ofs_x;
     dsc_out->ofs_y = gdsc->ofs_y;
     dsc_out->bpp   = (uint8_t)fdsc->bpp;
+    dsc_out->is_placeholder = false;
 
     if(is_tab) dsc_out->box_w = dsc_out->box_w * 2;
 
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_10.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_10.c
index 54f9f98e7..485d9f6f3 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_10.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_10.c
@@ -1650,7 +1650,7 @@ lv_font_t lv_font_montserrat_10 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12.c
index e3a1ee91c..e84d00c3e 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_12
-#define LV_FONT_MONTSERRAT_12 1
+    #define LV_FONT_MONTSERRAT_12 1
 #endif
 
 #if LV_FONT_MONTSERRAT_12
@@ -1416,8 +1416,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1434,8 +1433,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -1459,8 +1457,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -1484,8 +1481,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 2, 0, 0, 0,
     0, 1, 0, 0, 0, 0, 0, 0,
@@ -1864,8 +1860,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -1916,7 +1911,7 @@ lv_font_t lv_font_montserrat_12 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12_subpx.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12_subpx.c
index 48897d580..1ffd7ed9e 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12_subpx.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12_subpx.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_12_SUBPX
-#define LV_FONT_MONTSERRAT_12_SUBPX 1
+    #define LV_FONT_MONTSERRAT_12_SUBPX 1
 #endif
 
 #if LV_FONT_MONTSERRAT_12_SUBPX
@@ -3357,8 +3357,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -3375,8 +3374,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -3400,8 +3398,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -3425,8 +3422,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 2, 0, 0, 0,
     0, 1, 0, 0, 0, 0, 0, 0,
@@ -3805,8 +3801,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -3857,7 +3852,7 @@ lv_font_t lv_font_montserrat_12_subpx = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_HOR,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_14.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_14.c
index 86dd97cdf..cc4da9525 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_14.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_14.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_14
-#define LV_FONT_MONTSERRAT_14 1
+    #define LV_FONT_MONTSERRAT_14 1
 #endif
 
 #if LV_FONT_MONTSERRAT_14
@@ -1692,8 +1692,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1710,8 +1709,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -1735,8 +1733,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -1760,8 +1757,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 2, 0, 0, 0,
     0, 2, 0, 0, 0, 0, 0, 0,
@@ -2140,8 +2136,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -2192,7 +2187,7 @@ lv_font_t lv_font_montserrat_14 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_16.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_16.c
index b1dde1745..2b0dccf92 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_16.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_16.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_16
-#define LV_FONT_MONTSERRAT_16 1
+    #define LV_FONT_MONTSERRAT_16 1
 #endif
 
 #if LV_FONT_MONTSERRAT_16
@@ -1961,8 +1961,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1979,8 +1978,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -2004,8 +2002,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -2029,8 +2026,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 3, 0, 0, 0,
     0, 2, 0, 0, 0, 0, 0, 0,
@@ -2409,8 +2405,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -2461,7 +2456,7 @@ lv_font_t lv_font_montserrat_16 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_18.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_18.c
index 1583b97fb..c2e5d1de7 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_18.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_18.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_18
-#define LV_FONT_MONTSERRAT_18 1
+    #define LV_FONT_MONTSERRAT_18 1
 #endif
 
 #if LV_FONT_MONTSERRAT_18
@@ -2361,8 +2361,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -2379,8 +2378,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -2404,8 +2402,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -2429,8 +2426,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 3, 0, 0, 0,
     0, 2, 0, 0, 0, 0, 0, 0,
@@ -2809,8 +2805,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -2861,7 +2856,7 @@ lv_font_t lv_font_montserrat_18 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_20.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_20.c
index ee916d99d..bf1163900 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_20.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_20.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_20
-#define LV_FONT_MONTSERRAT_20 1
+    #define LV_FONT_MONTSERRAT_20 1
 #endif
 
 #if LV_FONT_MONTSERRAT_20
@@ -2718,8 +2718,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -2736,8 +2735,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -2761,8 +2759,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -2786,8 +2783,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 3, 0, 0, 0,
     0, 2, 0, 0, 0, 0, 0, 0,
@@ -3166,8 +3162,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -3218,7 +3213,7 @@ lv_font_t lv_font_montserrat_20 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_22.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_22.c
index cee57dce3..d96a666a0 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_22.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_22.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_22
-#define LV_FONT_MONTSERRAT_22 1
+    #define LV_FONT_MONTSERRAT_22 1
 #endif
 
 #if LV_FONT_MONTSERRAT_22
@@ -3147,8 +3147,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -3165,8 +3164,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -3190,8 +3188,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -3215,8 +3212,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 4, 0, 0, 0,
     0, 2, 0, 0, 0, 0, 0, 0,
@@ -3595,8 +3591,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -3647,7 +3642,7 @@ lv_font_t lv_font_montserrat_22 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_24.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_24.c
index 44ecf1757..9795f7031 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_24.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_24.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_24
-#define LV_FONT_MONTSERRAT_24 1
+    #define LV_FONT_MONTSERRAT_24 1
 #endif
 
 #if LV_FONT_MONTSERRAT_24
@@ -3558,8 +3558,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -3576,8 +3575,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -3601,8 +3599,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -3626,8 +3623,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 4, 0, 0, 0,
     0, 3, 0, 0, 0, 0, 0, 0,
@@ -4006,8 +4002,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -4058,7 +4053,7 @@ lv_font_t lv_font_montserrat_24 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_26.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_26.c
index b08e87769..416d84062 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_26.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_26.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_26
-#define LV_FONT_MONTSERRAT_26 1
+    #define LV_FONT_MONTSERRAT_26 1
 #endif
 
 #if LV_FONT_MONTSERRAT_26
@@ -4093,8 +4093,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -4111,8 +4110,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -4136,8 +4134,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -4161,8 +4158,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 4, 0, 0, 0,
     0, 3, 0, 0, 0, 0, 0, 0,
@@ -4541,8 +4537,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -4593,7 +4588,7 @@ lv_font_t lv_font_montserrat_26 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28.c
index a5fed0853..0ae2d7eec 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_28
-#define LV_FONT_MONTSERRAT_28 1
+    #define LV_FONT_MONTSERRAT_28 1
 #endif
 
 #if LV_FONT_MONTSERRAT_28
@@ -4642,8 +4642,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -4660,8 +4659,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -4685,8 +4683,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -4710,8 +4707,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 4, 0, 0, 0,
     0, 3, 0, 0, 0, 0, 0, 0,
@@ -5090,8 +5086,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -5142,7 +5137,7 @@ lv_font_t lv_font_montserrat_28 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28_compressed.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28_compressed.c
index 82c43679a..461258488 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28_compressed.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28_compressed.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_28_COMPRESSED
-#define LV_FONT_MONTSERRAT_28_COMPRESSED 1
+    #define LV_FONT_MONTSERRAT_28_COMPRESSED 1
 #endif
 
 #if LV_FONT_MONTSERRAT_28_COMPRESSED
@@ -2772,8 +2772,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -2790,8 +2789,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -2815,8 +2813,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -2840,8 +2837,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 4, 0, 0, 0,
     0, 3, 0, 0, 0, 0, 0, 0,
@@ -3220,8 +3216,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -3272,7 +3267,7 @@ lv_font_t lv_font_montserrat_28_compressed = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_30.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_30.c
index 22f736a64..f5532b399 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_30.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_30.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_30
-#define LV_FONT_MONTSERRAT_30 1
+    #define LV_FONT_MONTSERRAT_30 1
 #endif
 
 #if LV_FONT_MONTSERRAT_30
@@ -5224,8 +5224,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -5242,8 +5241,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -5267,8 +5265,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -5292,8 +5289,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 1, 0, 0, 0, 0, 0, 0,
     0, 1, 0, 0, 5, 0, 0, 0,
     0, 3, 0, 0, 0, 0, 0, 0,
@@ -5672,8 +5668,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -5724,7 +5719,7 @@ lv_font_t lv_font_montserrat_30 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_32.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_32.c
index 3c2fbb59c..f4dad0c96 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_32.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_32.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_32
-#define LV_FONT_MONTSERRAT_32 1
+    #define LV_FONT_MONTSERRAT_32 1
 #endif
 
 #if LV_FONT_MONTSERRAT_32
@@ -5713,8 +5713,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -5731,8 +5730,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -5756,8 +5754,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -5781,8 +5778,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 5, 0, 0, 0,
     0, 4, 0, 0, 0, 0, 0, 0,
@@ -6161,8 +6157,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -6213,7 +6208,7 @@ lv_font_t lv_font_montserrat_32 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_34.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_34.c
index a583b199c..064bb0a1e 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_34.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_34.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_34
-#define LV_FONT_MONTSERRAT_34 1
+    #define LV_FONT_MONTSERRAT_34 1
 #endif
 
 #if LV_FONT_MONTSERRAT_34
@@ -6512,8 +6512,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -6530,8 +6529,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -6555,8 +6553,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -6580,8 +6577,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 5, 0, 0, 0,
     0, 4, 0, 0, 0, 0, 0, 0,
@@ -6960,8 +6956,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -7012,7 +7007,7 @@ lv_font_t lv_font_montserrat_34 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_36.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_36.c
index 750ddd5f2..e5b2b6860 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_36.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_36.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_36
-#define LV_FONT_MONTSERRAT_36 1
+    #define LV_FONT_MONTSERRAT_36 1
 #endif
 
 #if LV_FONT_MONTSERRAT_36
@@ -7156,8 +7156,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -7174,8 +7173,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -7199,8 +7197,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -7224,8 +7221,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 6, 0, 0, 0,
     0, 4, 0, 0, 0, 0, 0, 0,
@@ -7604,8 +7600,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -7656,7 +7651,7 @@ lv_font_t lv_font_montserrat_36 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_38.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_38.c
index 1ecfe953b..883eae55c 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_38.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_38.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_38
-#define LV_FONT_MONTSERRAT_38 1
+    #define LV_FONT_MONTSERRAT_38 1
 #endif
 
 #if LV_FONT_MONTSERRAT_38
@@ -7901,8 +7901,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -7919,8 +7918,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -7944,8 +7942,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -7969,8 +7966,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 6, 0, 0, 0,
     0, 4, 0, 0, 0, 0, 0, 0,
@@ -8349,8 +8345,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -8401,7 +8396,7 @@ lv_font_t lv_font_montserrat_38 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_40.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_40.c
index 0a6d36cad..0769235e5 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_40.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_40.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_40
-#define LV_FONT_MONTSERRAT_40 1
+    #define LV_FONT_MONTSERRAT_40 1
 #endif
 
 #if LV_FONT_MONTSERRAT_40
@@ -8749,8 +8749,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -8767,8 +8766,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -8792,8 +8790,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -8817,8 +8814,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 6, 0, 0, 0,
     0, 4, 0, 0, 0, 0, 0, 0,
@@ -9197,8 +9193,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -9249,7 +9244,7 @@ lv_font_t lv_font_montserrat_40 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_42.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_42.c
index dd92e2864..a6563932c 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_42.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_42.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_42
-#define LV_FONT_MONTSERRAT_42 1
+    #define LV_FONT_MONTSERRAT_42 1
 #endif
 
 #if LV_FONT_MONTSERRAT_42
@@ -9591,8 +9591,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -9609,8 +9608,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -9634,8 +9632,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -9659,8 +9656,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 7, 0, 0, 0,
     0, 5, 0, 0, 0, 0, 0, 0,
@@ -10039,8 +10035,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -10091,7 +10086,7 @@ lv_font_t lv_font_montserrat_42 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_44.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_44.c
index 86d0f0cd2..4156909d6 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_44.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_44.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_44
-#define LV_FONT_MONTSERRAT_44 1
+    #define LV_FONT_MONTSERRAT_44 1
 #endif
 
 #if LV_FONT_MONTSERRAT_44
@@ -10417,8 +10417,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -10435,8 +10434,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -10460,8 +10458,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -10485,8 +10482,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 7, 0, 0, 0,
     0, 5, 0, 0, 0, 0, 0, 0,
@@ -10865,8 +10861,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -10917,7 +10912,7 @@ lv_font_t lv_font_montserrat_44 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_46.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_46.c
index 9d3f9a25d..745b42c2e 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_46.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_46.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_46
-#define LV_FONT_MONTSERRAT_46 1
+    #define LV_FONT_MONTSERRAT_46 1
 #endif
 
 #if LV_FONT_MONTSERRAT_46
@@ -11369,8 +11369,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -11387,8 +11386,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -11412,8 +11410,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -11437,8 +11434,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 7, 0, 0, 0,
     0, 5, 0, 0, 0, 0, 0, 0,
@@ -11817,8 +11813,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -11869,7 +11864,7 @@ lv_font_t lv_font_montserrat_46 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -3,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_48.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_48.c
index c627fdde3..9961b8368 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_48.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_48.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_MONTSERRAT_48
-#define LV_FONT_MONTSERRAT_48 1
+    #define LV_FONT_MONTSERRAT_48 1
 #endif
 
 #if LV_FONT_MONTSERRAT_48
@@ -12070,8 +12070,7 @@ static const uint16_t unicode_list_1[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 95, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -12088,8 +12087,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
 
 
 /*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] =
-{
+static const uint8_t kern_left_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 0, 13, 14, 15, 16, 17,
@@ -12113,8 +12111,7 @@ static const uint8_t kern_left_class_mapping[] =
 };
 
 /*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] =
-{
+static const uint8_t kern_right_class_mapping[] = {
     0, 0, 1, 2, 0, 3, 4, 5,
     2, 6, 7, 8, 9, 10, 9, 10,
     11, 12, 13, 14, 15, 16, 17, 12,
@@ -12138,8 +12135,7 @@ static const uint8_t kern_right_class_mapping[] =
 };
 
 /*Kern values between classes*/
-static const int8_t kern_class_values[] =
-{
+static const int8_t kern_class_values[] = {
     0, 2, 0, 0, 0, 0, 0, 0,
     0, 2, 0, 0, 8, 0, 0, 0,
     0, 5, 0, 0, 0, 0, 0, 0,
@@ -12518,8 +12514,7 @@ static const int8_t kern_class_values[] =
 
 
 /*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes =
-{
+static const lv_font_fmt_txt_kern_classes_t kern_classes = {
     .class_pair_values   = kern_class_values,
     .left_class_mapping  = kern_left_class_mapping,
     .right_class_mapping = kern_right_class_mapping,
@@ -12570,7 +12565,7 @@ lv_font_t lv_font_montserrat_48 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -4,
     .underline_thickness = 2,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_8.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_8.c
index 9d8b154b6..390333288 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_8.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_8.c
@@ -1436,7 +1436,7 @@ lv_font_t lv_font_montserrat_8 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -1,
     .underline_thickness = 0,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_simsun_16_cjk.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_simsun_16_cjk.c
index 0be9d90f8..bcd7c14c4 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_simsun_16_cjk.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_simsun_16_cjk.c
@@ -5,13 +5,13 @@
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
+    #include "lvgl.h"
 #else
-#include "../../lvgl.h"
+    #include "../../lvgl.h"
 #endif
 
 #ifndef LV_FONT_SIMSUN_16_CJK
-#define LV_FONT_SIMSUN_16_CJK 1
+    #define LV_FONT_SIMSUN_16_CJK 1
 #endif
 
 #if LV_FONT_SIMSUN_16_CJK
@@ -23696,8 +23696,7 @@ static const uint16_t unicode_list_5[] = {
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
+static const lv_font_fmt_txt_cmap_t cmaps[] = {
     {
         .range_start = 32, .range_length = 96, .glyph_id_start = 1,
         .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -23769,7 +23768,7 @@ lv_font_t lv_font_simsun_16_cjk = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = -2,
     .underline_thickness = 1,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_16.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_16.c
index 104bc2bce..d6b0eaa17 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_16.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_16.c
@@ -639,7 +639,7 @@ lv_font_t lv_font_unscii_16 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = 0,
     .underline_thickness = 0,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_8.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_8.c
index e67c5166d..1b03c8576 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_8.c
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_8.c
@@ -475,7 +475,7 @@ lv_font_t lv_font_unscii_8 = {
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
     .subpx = LV_FONT_SUBPX_NONE,
 #endif
-#if LV_VERSION_CHECK(7, 4, 0)
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
     .underline_position = 0,
     .underline_thickness = 0,
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/font/lv_symbol_def.h b/lib/libesp32_lvgl/lvgl/src/font/lv_symbol_def.h
index 75fd80b58..696daf189 100644
--- a/lib/libesp32_lvgl/lvgl/src/font/lv_symbol_def.h
+++ b/lib/libesp32_lvgl/lvgl/src/font/lv_symbol_def.h
@@ -7,93 +7,282 @@ extern "C" {
 
 #include "../lv_conf_internal.h"
 
+/*-------------------------------
+ * Symbols from "normal" font
+ *-----------------------------*/
+#if !defined LV_SYMBOL_BULLET
+#define LV_SYMBOL_BULLET          "\xE2\x80\xA2" /*20042, 0x2022*/
+#endif
+
 /*-------------------------------
  * Symbols from FontAwesome font
  *-----------------------------*/
 
 /*In the font converter use this list as range:
       61441, 61448, 61451, 61452, 61453, 61457, 61459, 61461, 61465, 61468,
-      61473, 61478, 61479, 61480, 61502, 61512, 61515, 61516, 61517, 61521,
-      61522, 61523, 61524, 61543, 61544, 61550, 61552, 61553, 61556, 61559,
-      61560, 61561, 61563, 61587, 61589, 61636, 61637, 61639, 61671, 61674,
-      61683, 61724, 61732, 61787, 61931, 62016, 62017, 62018, 62019, 62020,
-      62087, 62099, 62212, 62189, 62810, 63426, 63650
+      61473, 61478, 61479, 61480, 61502, 61507, 61512, 61515, 61516, 61517,
+      61521, 61522, 61523, 61524, 61543, 61544, 61550, 61552, 61553, 61556,
+      61559, 61560, 61561, 61563, 61587, 61589, 61636, 61637, 61639, 61641,
+      61664, 61671, 61674, 61683, 61724, 61732, 61787, 61931, 62016, 62017,
+      62018, 62019, 62020, 62087, 62099, 62189, 62212, 62810, 63426, 63650
 */
 
-#define LV_SYMBOL_AUDIO           "\xef\x80\x81" /*61441, 0xF001*/
-#define LV_SYMBOL_VIDEO           "\xef\x80\x88" /*61448, 0xF008*/
-#define LV_SYMBOL_LIST            "\xef\x80\x8b" /*61451, 0xF00B*/
-#define LV_SYMBOL_OK              "\xef\x80\x8c" /*61452, 0xF00C*/
-#define LV_SYMBOL_CLOSE           "\xef\x80\x8d" /*61453, 0xF00D*/
-#define LV_SYMBOL_POWER           "\xef\x80\x91" /*61457, 0xF011*/
-#define LV_SYMBOL_SETTINGS        "\xef\x80\x93" /*61459, 0xF013*/
-#define LV_SYMBOL_HOME            "\xef\x80\x95" /*61461, 0xF015*/
-#define LV_SYMBOL_DOWNLOAD        "\xef\x80\x99" /*61465, 0xF019*/
-#define LV_SYMBOL_DRIVE           "\xef\x80\x9c" /*61468, 0xF01C*/
-#define LV_SYMBOL_REFRESH         "\xef\x80\xa1" /*61473, 0xF021*/
-#define LV_SYMBOL_MUTE            "\xef\x80\xa6" /*61478, 0xF026*/
-#define LV_SYMBOL_VOLUME_MID      "\xef\x80\xa7" /*61479, 0xF027*/
-#define LV_SYMBOL_VOLUME_MAX      "\xef\x80\xa8" /*61480, 0xF028*/
-#define LV_SYMBOL_IMAGE           "\xef\x80\xbe" /*61502, 0xF03E*/
-#define LV_SYMBOL_ENVELOPE        "\xef\x83\xa0" /*61664, 0xF0E0*/
-#define LV_SYMBOL_EDIT            "\xef\x8C\x84" /*62212, 0xF304*/
-#define LV_SYMBOL_TINT            "\xef\x81\x83" /*61507, 0xF043*/
-#define LV_SYMBOL_PREV            "\xef\x81\x88" /*61512, 0xF048*/
-#define LV_SYMBOL_PLAY            "\xef\x81\x8b" /*61515, 0xF04B*/
-#define LV_SYMBOL_PAUSE           "\xef\x81\x8c" /*61516, 0xF04C*/
-#define LV_SYMBOL_STOP            "\xef\x81\x8d" /*61517, 0xF04D*/
-#define LV_SYMBOL_NEXT            "\xef\x81\x91" /*61521, 0xF051*/
-#define LV_SYMBOL_EJECT           "\xef\x81\x92" /*61522, 0xF052*/
-#define LV_SYMBOL_LEFT            "\xef\x81\x93" /*61523, 0xF053*/
-#define LV_SYMBOL_RIGHT           "\xef\x81\x94" /*61524, 0xF054*/
-#define LV_SYMBOL_PLUS            "\xef\x81\xa7" /*61543, 0xF067*/
-#define LV_SYMBOL_MINUS           "\xef\x81\xa8" /*61544, 0xF068*/
-#define LV_SYMBOL_EYE_OPEN        "\xef\x81\xae" /*61550, 0xF06E*/
-#define LV_SYMBOL_EYE_CLOSE       "\xef\x81\xb0" /*61552, 0xF070*/
-#define LV_SYMBOL_WARNING         "\xef\x81\xb1" /*61553, 0xF071*/
-#define LV_SYMBOL_SHUFFLE         "\xef\x81\xb4" /*61556, 0xF074*/
-#define LV_SYMBOL_UP              "\xef\x81\xb7" /*61559, 0xF077*/
-#define LV_SYMBOL_DOWN            "\xef\x81\xb8" /*61560, 0xF078*/
-#define LV_SYMBOL_LOOP            "\xef\x81\xb9" /*61561, 0xF079*/
-#define LV_SYMBOL_DIRECTORY       "\xef\x81\xbb" /*61563, 0xF07B*/
-#define LV_SYMBOL_UPLOAD          "\xef\x82\x93" /*61587, 0xF093*/
-#define LV_SYMBOL_CALL            "\xef\x82\x95" /*61589, 0xF095*/
-#define LV_SYMBOL_CUT             "\xef\x83\x84" /*61636, 0xF0C4*/
-#define LV_SYMBOL_COPY            "\xef\x83\x85" /*61637, 0xF0C5*/
-#define LV_SYMBOL_SAVE            "\xef\x83\x87" /*61639, 0xF0C7*/
-#define LV_SYMBOL_BARS            "\xef\x83\x89" /*61641, 0xF0C9*/
-#define LV_SYMBOL_CHARGE          "\xef\x83\xa7" /*61671, 0xF0E7*/
-#define LV_SYMBOL_PASTE           "\xef\x83\xAA" /*61674, 0xF0EA*/
-#define LV_SYMBOL_BELL            "\xef\x83\xb3" /*61683, 0xF0F3*/
-#define LV_SYMBOL_KEYBOARD        "\xef\x84\x9c" /*61724, 0xF11C*/
-#define LV_SYMBOL_GPS             "\xef\x84\xa4" /*61732, 0xF124*/
-#define LV_SYMBOL_FILE            "\xef\x85\x9b" /*61787, 0xF158*/
-#define LV_SYMBOL_WIFI            "\xef\x87\xab" /*61931, 0xF1EB*/
-#define LV_SYMBOL_BATTERY_FULL    "\xef\x89\x80" /*62016, 0xF240*/
-#define LV_SYMBOL_BATTERY_3       "\xef\x89\x81" /*62017, 0xF241*/
-#define LV_SYMBOL_BATTERY_2       "\xef\x89\x82" /*62018, 0xF242*/
-#define LV_SYMBOL_BATTERY_1       "\xef\x89\x83" /*62019, 0xF243*/
-#define LV_SYMBOL_BATTERY_EMPTY   "\xef\x89\x84" /*62020, 0xF244*/
-#define LV_SYMBOL_USB             "\xef\x8a\x87" /*62087, 0xF287*/
-#define LV_SYMBOL_BLUETOOTH       "\xef\x8a\x93" /*62099, 0xF293*/
-#define LV_SYMBOL_TRASH           "\xef\x8B\xad" /*62189, 0xF2ED*/
-#define LV_SYMBOL_BACKSPACE       "\xef\x95\x9A" /*62810, 0xF55A*/
-#define LV_SYMBOL_SD_CARD         "\xef\x9F\x82" /*63426, 0xF7C2*/
-#define LV_SYMBOL_NEW_LINE        "\xef\xA2\xA2" /*63650, 0xF8A2*/
+/* These symbols can be prefined in the lv_conf.h file.
+ * If they are not predefined, they will use the following values
+ */
 
+
+#if !defined LV_SYMBOL_AUDIO
+#define LV_SYMBOL_AUDIO           "\xEF\x80\x81" /*61441, 0xF001*/
+#endif
+
+#if !defined LV_SYMBOL_VIDEO
+#define LV_SYMBOL_VIDEO           "\xEF\x80\x88" /*61448, 0xF008*/
+#endif
+
+#if !defined LV_SYMBOL_LIST
+#define LV_SYMBOL_LIST            "\xEF\x80\x8B" /*61451, 0xF00B*/
+#endif
+
+#if !defined LV_SYMBOL_OK
+#define LV_SYMBOL_OK              "\xEF\x80\x8C" /*61452, 0xF00C*/
+#endif
+
+#if !defined LV_SYMBOL_CLOSE
+#define LV_SYMBOL_CLOSE           "\xEF\x80\x8D" /*61453, 0xF00D*/
+#endif
+
+#if !defined LV_SYMBOL_POWER
+#define LV_SYMBOL_POWER           "\xEF\x80\x91" /*61457, 0xF011*/
+#endif
+
+#if !defined LV_SYMBOL_SETTINGS
+#define LV_SYMBOL_SETTINGS        "\xEF\x80\x93" /*61459, 0xF013*/
+#endif
+
+#if !defined LV_SYMBOL_HOME
+#define LV_SYMBOL_HOME            "\xEF\x80\x95" /*61461, 0xF015*/
+#endif
+
+#if !defined LV_SYMBOL_DOWNLOAD
+#define LV_SYMBOL_DOWNLOAD        "\xEF\x80\x99" /*61465, 0xF019*/
+#endif
+
+#if !defined LV_SYMBOL_DRIVE
+#define LV_SYMBOL_DRIVE           "\xEF\x80\x9C" /*61468, 0xF01C*/
+#endif
+
+#if !defined LV_SYMBOL_REFRESH
+#define LV_SYMBOL_REFRESH         "\xEF\x80\xA1" /*61473, 0xF021*/
+#endif
+
+#if !defined LV_SYMBOL_MUTE
+#define LV_SYMBOL_MUTE            "\xEF\x80\xA6" /*61478, 0xF026*/
+#endif
+
+#if !defined LV_SYMBOL_VOLUME_MID
+#define LV_SYMBOL_VOLUME_MID      "\xEF\x80\xA7" /*61479, 0xF027*/
+#endif
+
+#if !defined LV_SYMBOL_VOLUME_MAX
+#define LV_SYMBOL_VOLUME_MAX      "\xEF\x80\xA8" /*61480, 0xF028*/
+#endif
+
+#if !defined LV_SYMBOL_IMAGE
+#define LV_SYMBOL_IMAGE           "\xEF\x80\xBE" /*61502, 0xF03E*/
+#endif
+
+#if !defined LV_SYMBOL_TINT
+#define LV_SYMBOL_TINT            "\xEF\x81\x83" /*61507, 0xF043*/
+#endif
+
+#if !defined LV_SYMBOL_PREV
+#define LV_SYMBOL_PREV            "\xEF\x81\x88" /*61512, 0xF048*/
+#endif
+
+#if !defined LV_SYMBOL_PLAY
+#define LV_SYMBOL_PLAY            "\xEF\x81\x8B" /*61515, 0xF04B*/
+#endif
+
+#if !defined LV_SYMBOL_PAUSE
+#define LV_SYMBOL_PAUSE           "\xEF\x81\x8C" /*61516, 0xF04C*/
+#endif
+
+#if !defined LV_SYMBOL_STOP
+#define LV_SYMBOL_STOP            "\xEF\x81\x8D" /*61517, 0xF04D*/
+#endif
+
+#if !defined LV_SYMBOL_NEXT
+#define LV_SYMBOL_NEXT            "\xEF\x81\x91" /*61521, 0xF051*/
+#endif
+
+#if !defined LV_SYMBOL_EJECT
+#define LV_SYMBOL_EJECT           "\xEF\x81\x92" /*61522, 0xF052*/
+#endif
+
+#if !defined LV_SYMBOL_LEFT
+#define LV_SYMBOL_LEFT            "\xEF\x81\x93" /*61523, 0xF053*/
+#endif
+
+#if !defined LV_SYMBOL_RIGHT
+#define LV_SYMBOL_RIGHT           "\xEF\x81\x94" /*61524, 0xF054*/
+#endif
+
+#if !defined LV_SYMBOL_PLUS
+#define LV_SYMBOL_PLUS            "\xEF\x81\xA7" /*61543, 0xF067*/
+#endif
+
+#if !defined LV_SYMBOL_MINUS
+#define LV_SYMBOL_MINUS           "\xEF\x81\xA8" /*61544, 0xF068*/
+#endif
+
+#if !defined LV_SYMBOL_EYE_OPEN
+#define LV_SYMBOL_EYE_OPEN        "\xEF\x81\xAE" /*61550, 0xF06E*/
+#endif
+
+#if !defined LV_SYMBOL_EYE_CLOSE
+#define LV_SYMBOL_EYE_CLOSE       "\xEF\x81\xB0" /*61552, 0xF070*/
+#endif
+
+#if !defined LV_SYMBOL_WARNING
+#define LV_SYMBOL_WARNING         "\xEF\x81\xB1" /*61553, 0xF071*/
+#endif
+
+#if !defined LV_SYMBOL_SHUFFLE
+#define LV_SYMBOL_SHUFFLE         "\xEF\x81\xB4" /*61556, 0xF074*/
+#endif
+
+#if !defined LV_SYMBOL_UP
+#define LV_SYMBOL_UP              "\xEF\x81\xB7" /*61559, 0xF077*/
+#endif
+
+#if !defined LV_SYMBOL_DOWN
+#define LV_SYMBOL_DOWN            "\xEF\x81\xB8" /*61560, 0xF078*/
+#endif
+
+#if !defined LV_SYMBOL_LOOP
+#define LV_SYMBOL_LOOP            "\xEF\x81\xB9" /*61561, 0xF079*/
+#endif
+
+#if !defined LV_SYMBOL_DIRECTORY
+#define LV_SYMBOL_DIRECTORY       "\xEF\x81\xBB" /*61563, 0xF07B*/
+#endif
+
+#if !defined LV_SYMBOL_UPLOAD
+#define LV_SYMBOL_UPLOAD          "\xEF\x82\x93" /*61587, 0xF093*/
+#endif
+
+#if !defined LV_SYMBOL_CALL
+#define LV_SYMBOL_CALL            "\xEF\x82\x95" /*61589, 0xF095*/
+#endif
+
+#if !defined LV_SYMBOL_CUT
+#define LV_SYMBOL_CUT             "\xEF\x83\x84" /*61636, 0xF0C4*/
+#endif
+
+#if !defined LV_SYMBOL_COPY
+#define LV_SYMBOL_COPY            "\xEF\x83\x85" /*61637, 0xF0C5*/
+#endif
+
+#if !defined LV_SYMBOL_SAVE
+#define LV_SYMBOL_SAVE            "\xEF\x83\x87" /*61639, 0xF0C7*/
+#endif
+
+#if !defined LV_SYMBOL_BARS
+#define LV_SYMBOL_BARS            "\xEF\x83\x89" /*61641, 0xF0C9*/
+#endif
+
+#if !defined LV_SYMBOL_ENVELOPE
+#define LV_SYMBOL_ENVELOPE        "\xEF\x83\xA0" /*61664, 0xF0E0*/
+#endif
+
+#if !defined LV_SYMBOL_CHARGE
+#define LV_SYMBOL_CHARGE          "\xEF\x83\xA7" /*61671, 0xF0E7*/
+#endif
+
+#if !defined LV_SYMBOL_PASTE
+#define LV_SYMBOL_PASTE           "\xEF\x83\xAA" /*61674, 0xF0EA*/
+#endif
+
+#if !defined LV_SYMBOL_BELL
+#define LV_SYMBOL_BELL            "\xEF\x83\xB3" /*61683, 0xF0F3*/
+#endif
+
+#if !defined LV_SYMBOL_KEYBOARD
+#define LV_SYMBOL_KEYBOARD        "\xEF\x84\x9C" /*61724, 0xF11C*/
+#endif
+
+#if !defined LV_SYMBOL_GPS
+#define LV_SYMBOL_GPS             "\xEF\x84\xA4" /*61732, 0xF124*/
+#endif
+
+#if !defined LV_SYMBOL_FILE
+#define LV_SYMBOL_FILE            "\xEF\x85\x9B" /*61787, 0xF158*/
+#endif
+
+#if !defined LV_SYMBOL_WIFI
+#define LV_SYMBOL_WIFI            "\xEF\x87\xAB" /*61931, 0xF1EB*/
+#endif
+
+#if !defined LV_SYMBOL_BATTERY_FULL
+#define LV_SYMBOL_BATTERY_FULL    "\xEF\x89\x80" /*62016, 0xF240*/
+#endif
+
+#if !defined LV_SYMBOL_BATTERY_3
+#define LV_SYMBOL_BATTERY_3       "\xEF\x89\x81" /*62017, 0xF241*/
+#endif
+
+#if !defined LV_SYMBOL_BATTERY_2
+#define LV_SYMBOL_BATTERY_2       "\xEF\x89\x82" /*62018, 0xF242*/
+#endif
+
+#if !defined LV_SYMBOL_BATTERY_1
+#define LV_SYMBOL_BATTERY_1       "\xEF\x89\x83" /*62019, 0xF243*/
+#endif
+
+#if !defined LV_SYMBOL_BATTERY_EMPTY
+#define LV_SYMBOL_BATTERY_EMPTY   "\xEF\x89\x84" /*62020, 0xF244*/
+#endif
+
+#if !defined LV_SYMBOL_USB
+#define LV_SYMBOL_USB             "\xEF\x8a\x87" /*62087, 0xF287*/
+#endif
+
+#if !defined LV_SYMBOL_BLUETOOTH
+#define LV_SYMBOL_BLUETOOTH       "\xEF\x8a\x93" /*62099, 0xF293*/
+#endif
+
+#if !defined LV_SYMBOL_TRASH
+#define LV_SYMBOL_TRASH           "\xEF\x8B\xAD" /*62189, 0xF2ED*/
+#endif
+
+#if !defined LV_SYMBOL_EDIT
+#define LV_SYMBOL_EDIT            "\xEF\x8C\x84" /*62212, 0xF304*/
+#endif
+
+#if !defined LV_SYMBOL_BACKSPACE
+#define LV_SYMBOL_BACKSPACE       "\xEF\x95\x9A" /*62810, 0xF55A*/
+#endif
+
+#if !defined LV_SYMBOL_SD_CARD
+#define LV_SYMBOL_SD_CARD         "\xEF\x9F\x82" /*63426, 0xF7C2*/
+#endif
+
+#if !defined LV_SYMBOL_NEW_LINE
+#define LV_SYMBOL_NEW_LINE        "\xEF\xA2\xA2" /*63650, 0xF8A2*/
+#endif
+
+#if !defined LV_SYMBOL_DUMMY
 /** Invalid symbol at (U+F8FF). If written before a string then `lv_img` will show it as a label*/
 #define LV_SYMBOL_DUMMY           "\xEF\xA3\xBF"
-
-/*-------------------------------
- * Symbols from "normal" font
- *-----------------------------*/
-#define LV_SYMBOL_BULLET          "\xE2\x80\xA2" /*20042, 0x2022*/
+#endif
 
 /*
  * The following list is generated using
  * cat src/font/lv_symbol_def.h | sed -E -n 's/^#define\s+LV_(SYMBOL_\w+).*".*$/    _LV_STR_\1,/p'
  */
 enum {
+    _LV_STR_SYMBOL_BULLET,
     _LV_STR_SYMBOL_AUDIO,
     _LV_STR_SYMBOL_VIDEO,
     _LV_STR_SYMBOL_LIST,
@@ -109,7 +298,7 @@ enum {
     _LV_STR_SYMBOL_VOLUME_MID,
     _LV_STR_SYMBOL_VOLUME_MAX,
     _LV_STR_SYMBOL_IMAGE,
-    _LV_STR_SYMBOL_EDIT,
+    _LV_STR_SYMBOL_TINT,
     _LV_STR_SYMBOL_PREV,
     _LV_STR_SYMBOL_PLAY,
     _LV_STR_SYMBOL_PAUSE,
@@ -133,6 +322,8 @@ enum {
     _LV_STR_SYMBOL_CUT,
     _LV_STR_SYMBOL_COPY,
     _LV_STR_SYMBOL_SAVE,
+    _LV_STR_SYMBOL_BARS,
+    _LV_STR_SYMBOL_ENVELOPE,
     _LV_STR_SYMBOL_CHARGE,
     _LV_STR_SYMBOL_PASTE,
     _LV_STR_SYMBOL_BELL,
@@ -148,11 +339,11 @@ enum {
     _LV_STR_SYMBOL_USB,
     _LV_STR_SYMBOL_BLUETOOTH,
     _LV_STR_SYMBOL_TRASH,
+    _LV_STR_SYMBOL_EDIT,
     _LV_STR_SYMBOL_BACKSPACE,
     _LV_STR_SYMBOL_SD_CARD,
     _LV_STR_SYMBOL_NEW_LINE,
     _LV_STR_SYMBOL_DUMMY,
-    _LV_STR_SYMBOL_BULLET,
 };
 
 #ifdef __cplusplus
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu.mk b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu.mk
index e162d79f6..f810e0c70 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu.mk
+++ b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu.mk
@@ -2,11 +2,9 @@ CSRCS += lv_gpu_nxp_pxp.c
 CSRCS += lv_gpu_nxp_pxp_osa.c
 CSRCS += lv_gpu_nxp_vglite.c
 CSRCS += lv_gpu_stm32_dma2d.c
-CSRCS += lv_gpu_sdl.c
 
 DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu
 VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu
 
 CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu"
 
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/sdl/lv_gpu_sdl.mk
\ No newline at end of file
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.c b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.c
deleted file mode 100644
index 9653e4121..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * @file lv_gpu_stm32_dma2d.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_gpu_stm32_dma2d.h"
-#include "../core/lv_disp.h"
-#include "../core/lv_refr.h"
-
-#if LV_USE_GPU_STM32_DMA2D
-
-#include LV_GPU_DMA2D_CMSIS_INCLUDE
-
-/*********************
- *      DEFINES
- *********************/
-
-#if LV_COLOR_16_SWAP
-    // TODO: F7 has red blue swap bit in control register for all layers and output
-    #error "Can't use DMA2D with LV_COLOR_16_SWAP 1"
-#endif
-
-#if LV_COLOR_DEPTH == 8
-    #error "Can't use DMA2D with LV_COLOR_DEPTH == 8"
-#endif
-
-#if LV_COLOR_DEPTH == 16
-    #define LV_DMA2D_COLOR_FORMAT LV_DMA2D_RGB565
-#elif LV_COLOR_DEPTH == 32
-    #define LV_DMA2D_COLOR_FORMAT LV_DMA2D_ARGB8888
-#else
-    /*Can't use GPU with other formats*/
-#endif
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void invalidate_cache(void);
-static void wait_finish(void);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Turn on the peripheral and set output color mode, this only needs to be done once
- */
-void lv_gpu_stm32_dma2d_init(void)
-{
-    /*Enable DMA2D clock*/
-#if defined(STM32F4) || defined(STM32F7)
-    RCC->AHB1ENR |= RCC_AHB1ENR_DMA2DEN;
-#elif defined(STM32H7)
-    RCC->AHB3ENR |= RCC_AHB3ENR_DMA2DEN;
-#else
-# warning "LVGL can't enable the clock of DMA2D"
-#endif
-
-    /*Wait for hardware access to complete*/
-    __asm volatile("DSB\n");
-
-    /*Delay after setting peripheral clock*/
-    volatile uint32_t temp = RCC->AHB1ENR;
-    LV_UNUSED(temp);
-
-    /*set output colour mode*/
-    DMA2D->OPFCCR = LV_DMA2D_COLOR_FORMAT;
-}
-
-/**
- * Fill an area in the buffer with a color
- * @param buf a buffer which should be filled
- * @param buf_w width of the buffer in pixels
- * @param color fill color
- * @param fill_w width to fill in pixels (<= buf_w)
- * @param fill_h height to fill in pixels
- * @note `buf_w - fill_w` is offset to the next line after fill
- */
-void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, lv_coord_t fill_w, lv_coord_t fill_h)
-{
-    invalidate_cache();
-
-    DMA2D->CR = 0x30000;
-    DMA2D->OMAR = (uint32_t)buf;
-    /*as input color mode is same as output we don't need to convert here do we?*/
-    DMA2D->OCOLR = color.full;
-    DMA2D->OOR = buf_w - fill_w;
-    DMA2D->NLR = (fill_w << DMA2D_NLR_PL_Pos) | (fill_h << DMA2D_NLR_NL_Pos);
-
-    /*start transfer*/
-    DMA2D->CR |= DMA2D_CR_START_Msk;
-
-    wait_finish();
-}
-
-/**
- * Fill an area in the buffer with a color but take into account a mask which describes the opacity of each pixel
- * @param buf a buffer which should be filled using a mask
- * @param buf_w width of the buffer in pixels
- * @param color fill color
- * @param mask 0..255 values describing the opacity of the corresponding pixel. Its width is `fill_w`
- * @param opa overall opacity. 255 in `mask` should mean this opacity.
- * @param fill_w width to fill in pixels (<= buf_w)
- * @param fill_h height to fill in pixels
- * @note `buf_w - fill_w` is offset to the next line after fill
- */
-void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, const lv_opa_t * mask,
-                                  lv_opa_t opa, lv_coord_t fill_w, lv_coord_t fill_h)
-{
-#if 0
-    invalidate_cache();
-
-    /*Configure the DMA2D Mode, Color Mode and line output offset*/
-    hdma2d.Init.Mode         = DMA2D_M2M_BLEND;
-    hdma2d.Init.ColorMode    = DMA2D_OUTPUT_FORMAT;
-    hdma2d.Init.OutputOffset = buf_w - fill_w;
-
-    /*Configure the foreground -> The character*/
-    lv_color32_t c32;
-    c32.full = lv_color_to32(color);
-    c32.ch.alpha = opa;
-    hdma2d.LayerCfg[1].AlphaMode       = DMA2D_COMBINE_ALPHA;
-    hdma2d.LayerCfg[1].InputAlpha      = c32.full;
-    hdma2d.LayerCfg[1].InputColorMode  = DMA2D_INPUT_A8;
-    hdma2d.LayerCfg[1].InputOffset     = 0;
-
-    /*Configure the background -> Display buffer*/
-    hdma2d.LayerCfg[0].AlphaMode       = DMA2D_NO_MODIF_ALPHA;
-    hdma2d.LayerCfg[0].InputAlpha      = 0x00;
-    hdma2d.LayerCfg[0].InputColorMode  = DMA2D_INPUT_FORMAT;
-    hdma2d.LayerCfg[0].InputOffset     = buf_w - fill_w;
-
-    /*DMA2D Initialization*/
-    HAL_DMA2D_Init(&hdma2d);
-    HAL_DMA2D_ConfigLayer(&hdma2d, 0);
-    HAL_DMA2D_ConfigLayer(&hdma2d, 1);
-    HAL_DMA2D_BlendingStart(&hdma2d, (uint32_t) mask, (uint32_t) buf, (uint32_t)buf, fill_w, fill_h);
-    wait_finish();
-#endif
-}
-
-/**
- * Copy a map (typically RGB image) to a buffer
- * @param buf a buffer where map should be copied
- * @param buf_w width of the buffer in pixels
- * @param map an "image" to copy
- * @param map_w width of the map in pixels
- * @param copy_w width of the area to copy in pixels (<= buf_w)
- * @param copy_h height of the area to copy in pixels
- * @note `map_w - fill_w` is offset to the next line after copy
- */
-void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_coord_t map_w,
-                             lv_coord_t copy_w, lv_coord_t copy_h)
-{
-    invalidate_cache();
-
-    DMA2D->CR = 0;
-    /*copy output colour mode, this register controls both input and output colour format*/
-    DMA2D->FGPFCCR = LV_DMA2D_COLOR_FORMAT;
-    DMA2D->FGMAR = (uint32_t)map;
-    DMA2D->FGOR = map_w - copy_w;
-    DMA2D->OMAR = (uint32_t)buf;
-    DMA2D->OOR = buf_w - copy_w;
-    DMA2D->NLR = (copy_w << DMA2D_NLR_PL_Pos) | (copy_h << DMA2D_NLR_NL_Pos);
-
-    /*start transfer*/
-    DMA2D->CR |= DMA2D_CR_START_Msk;
-    wait_finish();
-}
-
-/**
- * Blend a map (e.g. ARGB image or RGB image with opacity) to a buffer
- * @param buf a buffer where `map` should be copied
- * @param buf_w width of the buffer in pixels
- * @param map an "image" to copy
- * @param opa opacity of `map`
- * @param map_w width of the map in pixels
- * @param copy_w width of the area to copy in pixels (<= buf_w)
- * @param copy_h height of the area to copy in pixels
- * @note `map_w - fill_w` is offset to the next line after copy
- */
-void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_opa_t opa,
-                              lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h)
-{
-    invalidate_cache();
-    DMA2D->CR = 0x20000;
-
-    DMA2D->BGPFCCR = LV_DMA2D_COLOR_FORMAT;
-    DMA2D->BGMAR = (uint32_t)buf;
-    DMA2D->BGOR = buf_w - copy_w;
-
-    DMA2D->FGPFCCR = (uint32_t)LV_DMA2D_COLOR_FORMAT
-                     /*alpha mode 2, replace with foreground * alpha value*/
-                     | (2 << DMA2D_FGPFCCR_AM_Pos)
-                     /*alpha value*/
-                     | (opa << DMA2D_FGPFCCR_ALPHA_Pos);
-    DMA2D->FGMAR = (uint32_t)map;
-    DMA2D->FGOR = map_w - copy_w;
-
-    DMA2D->OMAR = (uint32_t)buf;
-    DMA2D->OOR = buf_w - copy_w;
-    DMA2D->NLR = (copy_w << DMA2D_NLR_PL_Pos) | (copy_h << DMA2D_NLR_NL_Pos);
-
-    /*start transfer*/
-    DMA2D->CR |= DMA2D_CR_START_Msk;
-    wait_finish();
-}
-
-void lv_gpu_stm32_dma2d_wait_cb(lv_disp_drv_t * drv)
-{
-    if(drv && drv->wait_cb) {
-        while(DMA2D->CR & DMA2D_CR_START_Msk) {
-            drv->wait_cb(drv);
-        }
-    }
-    else {
-        while(DMA2D->CR & DMA2D_CR_START_Msk);
-    }
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-static void invalidate_cache(void)
-{
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    if(disp->driver->clean_dcache_cb) disp->driver->clean_dcache_cb(disp->driver);
-    else {
-#if __CORTEX_M >= 0x07
-        if((SCB->CCR) & (uint32_t)SCB_CCR_DC_Msk)
-            SCB_CleanInvalidateDCache();
-#endif
-    }
-}
-
-static void wait_finish(void)
-{
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    if(disp->driver->gpu_wait_cb) return;
-
-    while(DMA2D->CR & DMA2D_CR_START_Msk) {
-        if(disp->driver->wait_cb) disp->driver->wait_cb(disp->driver);
-    }
-}
-
-#endif
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.h b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.h
deleted file mode 100644
index 014093cec..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @file lv_gpu_stm32_dma2d.h
- *
- */
-
-#ifndef LV_GPU_STM32_DMA2D_H
-#define LV_GPU_STM32_DMA2D_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "../misc/lv_area.h"
-#include "../misc/lv_color.h"
-#include "../hal/lv_hal_disp.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-#define LV_DMA2D_ARGB8888 0
-#define LV_DMA2D_RGB888 1
-#define LV_DMA2D_RGB565 2
-#define LV_DMA2D_ARGB1555 3
-#define LV_DMA2D_ARGB4444 4
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**
- * Turn on the peripheral and set output color mode, this only needs to be done once
- */
-void lv_gpu_stm32_dma2d_init(void);
-
-/**
- * Fill an area in the buffer with a color
- * @param buf a buffer which should be filled
- * @param buf_w width of the buffer in pixels
- * @param color fill color
- * @param fill_w width to fill in pixels (<= buf_w)
- * @param fill_h height to fill in pixels
- * @note `buf_w - fill_w` is offset to the next line after fill
- */
-void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, lv_coord_t fill_w,
-                             lv_coord_t fill_h);
-
-/**
- * Fill an area in the buffer with a color but take into account a mask which describes the opacity of each pixel
- * @param buf a buffer which should be filled using a mask
- * @param buf_w width of the buffer in pixels
- * @param color fill color
- * @param mask 0..255 values describing the opacity of the corresponding pixel. Its width is `fill_w`
- * @param opa overall opacity. 255 in `mask` should mean this opacity.
- * @param fill_w width to fill in pixels (<= buf_w)
- * @param fill_h height to fill in pixels
- * @note `buf_w - fill_w` is offset to the next line after fill
- */
-void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, const lv_opa_t * mask,
-                                  lv_opa_t opa, lv_coord_t fill_w, lv_coord_t fill_h);
-
-/**
- * Copy a map (typically RGB image) to a buffer
- * @param buf a buffer where map should be copied
- * @param buf_w width of the buffer in pixels
- * @param map an "image" to copy
- * @param map_w width of the map in pixels
- * @param copy_w width of the area to copy in pixels (<= buf_w)
- * @param copy_h height of the area to copy in pixels
- * @note `map_w - fill_w` is offset to the next line after copy
- */
-void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_coord_t map_w,
-                             lv_coord_t copy_w, lv_coord_t copy_h);
-/**
- * Blend a map (e.g. ARGB image or RGB image with opacity) to a buffer
- * @param buf a buffer where `map` should be copied
- * @param buf_w width of the buffer in pixels
- * @param map an "image" to copy
- * @param opa opacity of `map`
- * @param map_w width of the map in pixels
- * @param copy_w width of the area to copy in pixels (<= buf_w)
- * @param copy_h height of the area to copy in pixels
- * @note `map_w - fill_w` is offset to the next line after copy
- */
-void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_opa_t opa,
-                              lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h);
-
-/**
- * Can be used as `gpu_wait_cb` in display driver to
- * let the MCU run while the GPU is working
- */
-void lv_gpu_stm32_dma2d_wait_cb(lv_disp_drv_t * drv);
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_GPU_STM32_DMA2D_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl.mk b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl.mk
deleted file mode 100644
index f258c8ba6..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-CSRCS += lv_gpu_sdl_draw_arc.c
-CSRCS += lv_gpu_sdl_draw_blend.c
-CSRCS += lv_gpu_sdl_draw_img.c
-CSRCS += lv_gpu_sdl_draw_label.c
-CSRCS += lv_gpu_sdl_draw_line.c
-CSRCS += lv_gpu_sdl_draw_rect.c
-CSRCS += lv_gpu_sdl_lru.c
-CSRCS += lv_gpu_sdl_mask.c
-CSRCS += lv_gpu_sdl_stack_blur.c
-CSRCS += lv_gpu_sdl_texture_cache.c
-CSRCS += lv_gpu_sdl_utils.c
-
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/sdl
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/sdl
-
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/sdl"
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_arc.c b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_arc.c
deleted file mode 100644
index 21bf9d8fa..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_arc.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * @file lv_gpu_sdl_draw_arc.c
- *
- * This implementation does not functioning properly so it's not enabled
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include "../../hal/lv_hal_disp.h"
-#include "../../core/lv_refr.h"
-#include "../../draw/lv_draw_arc.h"
-#include "lv_gpu_sdl_utils.h"
-#include "lv_gpu_sdl_lru.h"
-#include "lv_gpu_sdl_texture_cache.h"
-#include "lv_gpu_sdl_mask.h"
-
-#ifndef M_PI
-    #include <math.h>
-#endif
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    uint16_t radius;
-    uint16_t angle;
-    lv_coord_t width;
-    uint8_t rounded;
-} lv_draw_arc_key_t;
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void lv_draw_arc2(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uint16_t start_angle, uint16_t end_angle,
-                  const lv_area_t * clip_area, const lv_draw_arc_dsc_t * dsc)
-{
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    lv_disp_drv_t * driver = disp->driver;
-    SDL_Renderer * renderer = (SDL_Renderer *) driver->user_data;
-
-    lv_area_t area_out;
-    area_out.x1 = center_x - radius;
-    area_out.y1 = center_y - radius;
-    area_out.x2 = center_x + radius - 1;  /*-1 because the center already belongs to the left/bottom part*/
-    area_out.y2 = center_y + radius - 1;
-
-    lv_area_t area_in;
-    lv_area_copy(&area_in, &area_out);
-    area_in.x1 += dsc->width;
-    area_in.y1 += dsc->width;
-    area_in.x2 -= dsc->width;
-    area_in.y2 -= dsc->width;
-
-    /*Increase 1 px each side to texture, to have better rotation result*/
-    lv_area_t texture_area_out;
-    lv_area_copy(&texture_area_out, &area_out);
-    lv_area_increase(&texture_area_out, 1, 1);
-
-    SDL_Rect area_out_rect, clip_rect;
-    lv_area_to_sdl_rect(&texture_area_out, &area_out_rect);
-    lv_area_to_sdl_rect(clip_area, &clip_rect);
-
-    lv_draw_arc_key_t key = {
-        .magic = LV_GPU_CACHE_KEY_MAGIC_ARC,
-        .radius = radius,
-        .angle = ((end_angle - start_angle) % 360 + 360) % 360,
-        .width = dsc->width,
-        .rounded = dsc->rounded,
-    };
-    //    SDL_Texture *texture = lv_gpu_draw_cache_get(&key, sizeof(key));
-    SDL_Texture * texture = NULL;
-    if(texture == NULL) {
-        /*Create inner the mask*/
-        lv_draw_mask_radius_param_t mask_in_param;
-        lv_draw_mask_radius_init(&mask_in_param, &area_in, LV_RADIUS_CIRCLE, true);
-        int16_t mask_in_id = lv_draw_mask_add(&mask_in_param, NULL);
-
-        lv_draw_mask_radius_param_t mask_out_param;
-        lv_draw_mask_radius_init(&mask_out_param, &area_out, LV_RADIUS_CIRCLE, false);
-        int16_t mask_out_id = lv_draw_mask_add(&mask_out_param, NULL);
-
-        SDL_Surface * ark_mask;
-        if(key.angle < 360) {
-            while(start_angle >= 360) start_angle -= 360;
-            while(end_angle >= 360) end_angle -= 360;
-            lv_draw_mask_angle_param_t mask_angle_param;
-            lv_draw_mask_angle_init(&mask_angle_param, center_x, center_y, 0, key.angle);
-            int16_t mask_angle_id = lv_draw_mask_add(&mask_angle_param, NULL);
-            ark_mask = lv_sdl_apply_mask_surface(&texture_area_out, NULL, 0);
-            lv_draw_mask_remove_id(mask_angle_id);
-        }
-        else {
-            ark_mask = lv_sdl_apply_mask_surface(&texture_area_out, NULL, 0);
-        }
-        lv_draw_mask_remove_id(mask_out_id);
-        lv_draw_mask_remove_id(mask_in_id);
-
-        if(dsc->rounded) {
-            SDL_Renderer * mask_renderer = SDL_CreateSoftwareRenderer(ark_mask);
-            lv_area_t cap_area = {.x1 = 0, .y1 = 0};
-            lv_area_set_width(&cap_area, dsc->width);
-            lv_area_set_height(&cap_area, dsc->width);
-
-            lv_draw_mask_radius_param_t mask_rout_param;
-            lv_draw_mask_radius_init(&mask_rout_param, &cap_area, LV_RADIUS_CIRCLE, false);
-            int16_t mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
-            SDL_Texture * round_texture = lv_sdl_gen_mask_texture(mask_renderer, &cap_area, &mask_rout_id, 1);
-            lv_draw_mask_remove_id(mask_rout_id);
-
-            SDL_SetTextureBlendMode(round_texture, SDL_BLENDMODE_BLEND);
-            float mid_point = radius - key.width / 2.0f;
-            SDL_Rect cap_dst;
-            cap_dst.w = lv_area_get_width(&cap_area);
-            cap_dst.h = lv_area_get_height(&cap_area);
-            cap_dst.x = mid_point + lv_sdl_round(SDL_cos(0) * mid_point);
-            cap_dst.y = mid_point + lv_sdl_round(SDL_sin(0) * mid_point);
-            SDL_RenderCopy(mask_renderer, round_texture, NULL, &cap_dst);
-            cap_dst.x = mid_point + lv_sdl_round(SDL_cos(key.angle * M_PI / 180.0f) * mid_point);
-            cap_dst.y = mid_point + lv_sdl_round(SDL_sin(key.angle * M_PI / 180.0f) * mid_point);
-            SDL_RenderCopy(mask_renderer, round_texture, NULL, &cap_dst);
-            SDL_DestroyTexture(round_texture);
-            SDL_DestroyRenderer(mask_renderer);
-        }
-        texture = SDL_CreateTextureFromSurface(renderer, ark_mask);
-        SDL_FreeSurface(ark_mask);
-
-        SDL_assert(texture);
-        //        lv_gpu_draw_cache_put(&key, sizeof(key), texture);
-    }
-
-    SDL_Color arc_color;
-    lv_color_to_sdl_color(&dsc->color, &arc_color);
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(texture, dsc->opa);
-    SDL_SetTextureColorMod(texture, arc_color.r, arc_color.g, arc_color.b);
-    SDL_RenderSetClipRect(renderer, &clip_rect);
-    SDL_RenderCopyEx(renderer, texture, NULL, &area_out_rect, start_angle, NULL, SDL_FLIP_NONE);
-    SDL_DestroyTexture(texture);
-}
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_blend.c b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_blend.c
deleted file mode 100644
index f45ae118e..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_blend.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * @file lv_gpu_sdl_draw_blend.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include "../../draw/lv_draw_blend.h"
-#include "../../core/lv_refr.h"
-#include "lv_gpu_sdl_texture_cache.h"
-#include "lv_gpu_sdl_utils.h"
-#include "lv_gpu_sdl_mask.h"
-
-#include LV_GPU_SDL_INCLUDE_PATH
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void _lv_blend_fill(const lv_area_t * clip_area, const lv_area_t * fill_area, lv_color_t color,
-                    lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode)
-{
-    /*Do not draw transparent things*/
-    if(opa < LV_OPA_MIN) return;
-    if(mask_res == LV_DRAW_MASK_RES_TRANSP) return;
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    /*Get clipped fill area which is the real draw area.
-     *It is always the same or inside `fill_area`*/
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, clip_area, fill_area)) return;
-
-    SDL_Rect draw_area_rect;
-    lv_area_to_sdl_rect(&draw_area, &draw_area_rect);
-    if(mask) {
-        SDL_Surface * mask_surface = lv_sdl_create_mask_surface(mask, lv_area_get_width(&draw_area),
-                                                                lv_area_get_height(&draw_area),
-                                                                lv_area_get_width(&draw_area));
-        SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, mask_surface);
-        SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-        SDL_SetTextureAlphaMod(texture, opa);
-        SDL_SetTextureColorMod(texture, color.ch.red, color.ch.green, color.ch.blue);
-        SDL_RenderSetClipRect(renderer, &draw_area_rect);
-        SDL_RenderCopy(renderer, texture, NULL, &draw_area_rect);
-        SDL_DestroyTexture(texture);
-        SDL_FreeSurface(mask_surface);
-    }
-    else {
-        SDL_SetRenderDrawColor(renderer, color.ch.red, color.ch.green, color.ch.blue, opa);
-        SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND);
-        SDL_RenderSetClipRect(renderer, &draw_area_rect);
-        SDL_RenderFillRect(renderer, &draw_area_rect);
-    }
-}
-
-void _lv_blend_map(const lv_area_t * clip_area, const lv_area_t * map_area,
-                   const lv_color_t * map_buf, lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa,
-                   lv_blend_mode_t mode)
-{
-    LV_UNUSED(clip_area);
-    LV_UNUSED(map_area);
-    LV_UNUSED(map_buf);
-    LV_UNUSED(mask);
-    LV_UNUSED(mask_res);
-    LV_UNUSED(opa);
-    LV_UNUSED(mode);
-
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_img.c b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_img.c
deleted file mode 100644
index d777b42d1..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_img.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * @file lv_gpu_sdl_draw_img.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include "../../core/lv_refr.h"
-#include "lv_gpu_sdl_utils.h"
-#include "lv_gpu_sdl_lru.h"
-#include "lv_gpu_sdl_texture_cache.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-static SDL_Texture * upload_img_texture(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc);
-
-static SDL_Texture * upload_img_texture_fallback(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void * src,
-                 const lv_draw_img_dsc_t * draw_dsc)
-{
-    if(draw_dsc->opa <= LV_OPA_MIN) return;
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    size_t key_size;
-    lv_gpu_sdl_cache_key_head_img_t * key = lv_gpu_sdl_img_cache_key_create(src, draw_dsc->frame_id, &key_size);
-    bool texture_found = false;
-    SDL_Texture * texture = lv_gpu_draw_cache_get(key, key_size, &texture_found);
-    if(!texture_found) {
-        _lv_img_cache_entry_t * cdsc = _lv_img_cache_open(src, draw_dsc->recolor, draw_dsc->frame_id);
-        lv_gpu_sdl_cache_flag_t tex_flags = 0;
-        if(cdsc) {
-            lv_img_decoder_dsc_t * dsc = &cdsc->dec_dsc;
-            if(dsc->user_data && SDL_memcmp(dsc->user_data, LV_GPU_SDL_DEC_DSC_TEXTURE_HEAD, 8) == 0) {
-                texture = ((lv_gpu_sdl_dec_dsc_userdata_t *) dsc->user_data)->texture;
-                tex_flags |= LV_GPU_SDL_CACHE_FLAG_MANAGED;
-            }
-            else {
-                texture = upload_img_texture(renderer, dsc);
-            }
-#if LV_IMG_CACHE_DEF_SIZE == 0
-            lv_img_decoder_close(dsc);
-#endif
-        }
-        if(texture && cdsc) {
-            lv_img_header_t * header = SDL_malloc(sizeof(lv_img_header_t));
-            SDL_memcpy(header, &cdsc->dec_dsc.header, sizeof(lv_img_header_t));
-            lv_gpu_draw_cache_put_advanced(key, key_size, texture, header, SDL_free, tex_flags);
-        }
-        else {
-            lv_gpu_draw_cache_put(key, key_size, NULL);
-        }
-    }
-    SDL_free(key);
-    if(!texture) {
-        return;
-    }
-
-    SDL_Rect mask_rect, coords_rect;
-    lv_area_to_sdl_rect(mask, &mask_rect);
-    lv_area_to_sdl_rect(coords, &coords_rect);
-    lv_area_zoom_to_sdl_rect(coords, &coords_rect, draw_dsc->zoom, &draw_dsc->pivot);
-
-    SDL_Point pivot = {.x = draw_dsc->pivot.x, .y = draw_dsc->pivot.y};
-    SDL_SetTextureAlphaMod(texture, draw_dsc->opa);
-    SDL_SetTextureColorMod(texture, 0xFF, 0xFF, 0xFF);
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-    SDL_RenderSetClipRect(renderer, &mask_rect);
-
-    SDL_Color recolor;
-    lv_color_to_sdl_color(&draw_dsc->recolor, &recolor);
-    /*Draw original image if not fully recolored*/
-    /*TODO: what if the image is translucent as well?*/
-    if(draw_dsc->recolor_opa < LV_OPA_MAX) {
-        SDL_RenderCopyEx(renderer, texture, NULL, &coords_rect, draw_dsc->angle, &pivot, SDL_FLIP_NONE);
-    }
-
-    SDL_SetTextureColorMod(texture, recolor.r, recolor.g, recolor.b);
-    if(draw_dsc->recolor_opa >= LV_OPA_MAX) {
-        /*Draw fully colored image*/
-        SDL_SetTextureAlphaMod(texture, draw_dsc->opa);
-        SDL_RenderCopyEx(renderer, texture, NULL, &coords_rect, draw_dsc->angle, &pivot, SDL_FLIP_NONE);
-    }
-    else if(draw_dsc->recolor_opa >= LV_OPA_MIN) {
-        SDL_SetTextureAlphaMod(texture, draw_dsc->recolor_opa);
-        SDL_RenderCopyEx(renderer, texture, NULL, &coords_rect, draw_dsc->angle, &pivot, SDL_FLIP_NONE);
-    }
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-static SDL_Texture * upload_img_texture(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc)
-{
-    if(!dsc->img_data) {
-        return upload_img_texture_fallback(renderer, dsc);
-    }
-    bool chroma_keyed = dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED;
-    uint32_t h = dsc->header.h;
-    uint32_t w = dsc->header.w;
-    void * data = (void *) dsc->img_data;
-    Uint32 rmask = 0x00FF0000;
-    Uint32 gmask = 0x0000FF00;
-    Uint32 bmask = 0x000000FF;
-    Uint32 amask = 0xFF000000;
-    if(chroma_keyed) {
-        amask = 0x00;
-    }
-    SDL_Surface * surface = SDL_CreateRGBSurfaceFrom(data, w, h, LV_COLOR_DEPTH, w * LV_COLOR_DEPTH / 8,
-                                                     rmask, gmask, bmask, amask);
-    SDL_SetColorKey(surface, chroma_keyed, lv_color_to32(LV_COLOR_CHROMA_KEY));
-    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
-    SDL_FreeSurface(surface);
-    return texture;
-}
-
-static SDL_Texture * upload_img_texture_fallback(SDL_Renderer * renderer, lv_img_decoder_dsc_t * dsc)
-{
-    lv_coord_t h = dsc->header.h;
-    lv_coord_t w = dsc->header.w;
-    uint8_t * data = lv_mem_buf_get(w * h * sizeof(lv_color_t));
-    for(lv_coord_t y = 0; y < h; y++) {
-        lv_img_decoder_read_line(dsc, 0, y, w, &data[y * w * sizeof(lv_color_t)]);
-    }
-    Uint32 rmask = 0x00FF0000;
-    Uint32 gmask = 0x0000FF00;
-    Uint32 bmask = 0x000000FF;
-    Uint32 amask = 0xFF000000;
-    SDL_Surface * surface = SDL_CreateRGBSurfaceFrom(data, w, h, LV_COLOR_DEPTH, w * LV_COLOR_DEPTH / 8,
-                                                     rmask, gmask, bmask, amask);
-    SDL_SetColorKey(surface, SDL_TRUE, lv_color_to32(LV_COLOR_CHROMA_KEY));
-    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, surface);
-    SDL_FreeSurface(surface);
-    lv_mem_buf_release(data);
-    return texture;
-}
-
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_label.c b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_label.c
deleted file mode 100644
index e87773e53..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_label.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * @file lv_gpu_sdl_draw_label.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include "../../draw/lv_draw_label.h"
-#include "../../font/lv_font_fmt_txt.h"
-#include "../../core/lv_refr.h"
-#include "../../misc/lv_utils.h"
-
-#include LV_GPU_SDL_INCLUDE_PATH
-
-#include "lv_gpu_sdl_utils.h"
-#include "lv_gpu_sdl_texture_cache.h"
-#include "lv_gpu_sdl_mask.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-typedef struct lv_sdl_font_atlas_t {
-    SDL_Rect * pos;
-} lv_sdl_font_atlas_t;
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    const lv_font_t * font_p;
-    uint32_t cmap_index;
-} lv_font_key_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-static void draw_letter_masked(SDL_Renderer * renderer, SDL_Texture * atlas, SDL_Rect * src, SDL_Rect * dst,
-                               SDL_Rect * clip, lv_color_t color, lv_opa_t opa);
-
-static void font_atlas_free(lv_sdl_font_atlas_t * atlas);
-
-static SDL_Texture * font_atlas_bake(SDL_Renderer * renderer, const lv_font_t * font_p, uint32_t cmap_idx,
-                                     lv_sdl_font_atlas_t * atlas);
-
-static int32_t unicode_list_compare(const void * ref, const void * element);
-
-static bool font_cmap_find_index(const lv_font_fmt_txt_dsc_t * dsc, uint32_t letter, uint32_t * cmap_index,
-                                 uint32_t * char_index);
-
-static lv_font_key_t font_key_create(const lv_font_t * font_p, uint32_t cmap_index);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * clip_area,
-                    const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa,
-                    lv_blend_mode_t blend_mode)
-{
-    if(opa < LV_OPA_MIN) return;
-    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
-
-    if(font_p == NULL) {
-        LV_LOG_WARN("lv_draw_letter: font is NULL");
-        return;
-    }
-
-    lv_font_glyph_dsc_t g;
-    bool g_ret = lv_font_get_glyph_dsc(font_p, &g, letter, '\0');
-    if(g_ret == false) {
-        /*Add warning if the dsc is not found
-         *but do not print warning for non printable ASCII chars (e.g. '\n')*/
-        if(letter >= 0x20 &&
-           letter != 0xf8ff && /*LV_SYMBOL_DUMMY*/
-           letter != 0x200c) { /*ZERO WIDTH NON-JOINER*/
-            LV_LOG_WARN("lv_draw_letter: glyph dsc. not found for U+%X", letter);
-        }
-        return;
-    }
-
-    /*Don't draw anything if the character is empty. E.g. space*/
-    if((g.box_h == 0) || (g.box_w == 0)) return;
-
-    int32_t pos_x = pos_p->x + g.ofs_x;
-    int32_t pos_y = pos_p->y + (font_p->line_height - font_p->base_line) - g.box_h - g.ofs_y;
-
-    /*If the letter is completely out of mask don't draw it*/
-    if(pos_x + g.box_w < clip_area->x1 ||
-       pos_x > clip_area->x2 ||
-       pos_y + g.box_h < clip_area->y1 ||
-       pos_y > clip_area->y2) {
-        return;
-    }
-    lv_area_t dst = {pos_x, pos_y, pos_x + g.box_w - 1, pos_y + g.box_h - 1};
-    uint32_t atlas_index;
-    uint32_t cmap_index;
-    if(!font_cmap_find_index(font_p->dsc, letter, &cmap_index, &atlas_index)) {
-        return;
-    }
-    lv_font_key_t key = font_key_create(font_p, cmap_index);
-    lv_sdl_font_atlas_t * atlas = NULL;
-    bool found = false;
-    SDL_Texture * texture = lv_gpu_draw_cache_get_with_userdata(&key, sizeof(key), &found, (void **) &atlas);
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    if(!found) {
-        atlas = SDL_malloc(sizeof(lv_sdl_font_atlas_t));
-        texture = font_atlas_bake(renderer, font_p, cmap_index, atlas);
-        lv_gpu_draw_cache_put_advanced(&key, sizeof(key), texture, atlas, (lv_lru_free_t *) font_atlas_free, 0);
-    }
-    if(texture == NULL) return;
-    SDL_Rect dstrect = {.x = pos_x, .y = pos_y, .w = g.box_w, .h = g.box_h};
-
-    SDL_Rect clip_area_rect;
-    lv_area_to_sdl_rect(clip_area, &clip_area_rect);
-
-    if(lv_draw_mask_is_any(&dst)) {
-        draw_letter_masked(renderer, texture, &atlas->pos[atlas_index], &dstrect, &clip_area_rect, color, opa);
-        return;
-    }
-
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(texture, opa);
-    SDL_SetTextureColorMod(texture, color.ch.red, color.ch.green, color.ch.blue);
-    SDL_RenderSetClipRect(renderer, &clip_area_rect);
-    SDL_RenderCopy(renderer, texture, &atlas->pos[atlas_index], &dstrect);
-}
-
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-static void draw_letter_masked(SDL_Renderer * renderer, SDL_Texture * atlas, SDL_Rect * src, SDL_Rect * dst,
-                               SDL_Rect * clip, lv_color_t color, lv_opa_t opa)
-{
-    SDL_Texture * screen = SDL_GetRenderTarget(renderer);
-
-    lv_area_t mask_area = {.x1 = dst->x, .x2 = dst->x + dst->w - 1, .y1 = dst->y, .y2 = dst->y + dst->h - 1};
-    SDL_Texture * content = lv_gpu_temp_texture_obtain(renderer, dst->w, dst->h);
-    SDL_SetTextureBlendMode(content, SDL_BLENDMODE_NONE);
-    SDL_SetRenderTarget(renderer, content);
-    SDL_RenderSetClipRect(renderer, NULL);
-
-    /* Replace texture with clip mask */
-    SDL_Rect mask_rect = {.w = dst->w, .h = dst->h, .x = 0, .y = 0};
-    SDL_Texture * mask = lv_sdl_gen_mask_texture(renderer, &mask_area, NULL, 0);
-    SDL_SetTextureBlendMode(mask, SDL_BLENDMODE_NONE);
-    SDL_RenderCopy(renderer, mask, NULL, &mask_rect);
-
-    /* Multiply with font atlas */
-    SDL_SetTextureAlphaMod(atlas, 0xFF);
-    SDL_SetTextureColorMod(atlas, 0xFF, 0xFF, 0xFF);
-#if SDL_VERSION_ATLEAST(2, 0, 6)
-    SDL_BlendMode mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ZERO,
-                                                    SDL_BLENDOPERATION_ADD, SDL_BLENDFACTOR_ZERO,
-                                                    SDL_BLENDFACTOR_SRC_ALPHA, SDL_BLENDOPERATION_ADD);
-    SDL_SetTextureBlendMode(atlas, mode);
-#else
-    SDL_SetTextureBlendMode(atlas, SDL_BLENDMODE_BLEND);
-#endif
-    SDL_RenderCopy(renderer, atlas, src, &mask_rect);
-
-    /* Draw composited part on screen */
-    SDL_SetTextureBlendMode(content, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(content, opa);
-    SDL_SetTextureColorMod(content, color.ch.red, color.ch.green, color.ch.blue);
-
-    SDL_SetRenderTarget(renderer, screen);
-    SDL_RenderSetClipRect(renderer, clip);
-    SDL_RenderCopy(renderer, content, &mask_rect, dst);
-    SDL_DestroyTexture(mask);
-}
-
-SDL_Texture * font_atlas_bake(SDL_Renderer * renderer, const lv_font_t * font_p, uint32_t cmap_idx,
-                              lv_sdl_font_atlas_t * atlas)
-{
-    /* Clear atlas struct */
-    SDL_memset(atlas, 0, sizeof(lv_sdl_font_atlas_t));
-    const lv_font_fmt_txt_dsc_t * dsc = (lv_font_fmt_txt_dsc_t *) font_p->dsc;
-    if(dsc->bitmap_format != LV_FONT_FMT_TXT_PLAIN) {
-        /* we don't support compressed font at this moment */
-        return NULL;
-    }
-    const lv_font_fmt_txt_cmap_t * cmap = &dsc->cmaps[cmap_idx];
-    int glyph_count = cmap->type == LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY ? cmap->range_length : cmap->list_length;
-    int atlas_size = 0;
-    while(atlas_size * atlas_size < glyph_count) {
-        atlas_size++;
-    }
-    int atlas_w = font_p->line_height * atlas_size;
-    int atlas_h = font_p->line_height * (glyph_count / atlas_size + 1);
-    if(atlas_w > 2048 || atlas_h > 2048) {
-        /*This atlas texture will be too large to load*/
-        return NULL;
-    }
-    lv_opa_t * s1 = lv_mem_buf_get(atlas_w * atlas_h * sizeof(lv_opa_t));
-    atlas->pos = SDL_malloc(sizeof(SDL_Rect) * glyph_count);
-    int atlas_y = 0;
-    int atlas_x = 0;
-    for(int i = 0; i < glyph_count; i++) {
-        int glyph_idx = cmap->glyph_id_start + i;
-        switch(cmap->type) {
-            case LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL: {
-                    const uint8_t * gid_ofs_8 = cmap->glyph_id_ofs_list;
-                    glyph_idx = gid_ofs_8[i];
-                    break;
-                }
-            case LV_FONT_FMT_TXT_CMAP_SPARSE_FULL: {
-                    const uint16_t * gid_ofs_16 = cmap->glyph_id_ofs_list;
-                    glyph_idx = gid_ofs_16[i];
-                    break;
-                }
-        }
-        const lv_font_fmt_txt_glyph_dsc_t * gd = &dsc->glyph_dsc[glyph_idx];
-        if(atlas_x + gd->box_w >= atlas_w) {
-            atlas_x = 0;
-            atlas_y += font_p->line_height;
-        }
-        SDL_Rect * rect = &atlas->pos[i];
-        rect->x = atlas_x;
-        rect->y = atlas_y;
-        rect->w = gd->box_w;
-        rect->h = gd->box_h;
-        if(gd->box_w <= 0 || gd->box_h <= 0) {
-            continue;
-        }
-        lv_sdl_to_8bpp(&s1[rect->y * atlas_w + rect->x], &dsc->glyph_bitmap[gd->bitmap_index], rect->w,
-                       rect->h, atlas_w, dsc->bpp);
-        atlas_x += gd->box_w;
-    }
-    SDL_Surface * mask = lv_sdl_create_mask_surface(s1, atlas_w, atlas_h, atlas_w);
-    SDL_Texture * result = SDL_CreateTextureFromSurface(renderer, mask);
-    SDL_FreeSurface(mask);
-    lv_mem_buf_release(s1);
-
-    if(!result) {
-        if(atlas->pos) {
-            SDL_free(atlas->pos);
-        }
-        SDL_memset(atlas, 0, sizeof(lv_sdl_font_atlas_t));
-    }
-    return result;
-}
-
-static void font_atlas_free(lv_sdl_font_atlas_t * atlas)
-{
-    if(atlas->pos) {
-        SDL_free(atlas->pos);
-    }
-    SDL_free(atlas);
-}
-
-static bool font_cmap_find_index(const lv_font_fmt_txt_dsc_t * dsc, uint32_t letter, uint32_t * cmap_index,
-                                 uint32_t * char_index)
-{
-    for(int i = 0; i < dsc->cmap_num; i++) {
-        const lv_font_fmt_txt_cmap_t * cmap = &dsc->cmaps[i];
-        /*Relative code point*/
-        uint32_t rcp = letter - cmap->range_start;
-        if(rcp > cmap->range_length) continue;
-        if(cmap->type == LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY) {
-            *cmap_index = i;
-            *char_index = rcp;
-            return true;
-        }
-        else if(cmap->type == LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL) {
-            *cmap_index = i;
-            *char_index = rcp;
-            return true;
-        }
-        else if(cmap->type == LV_FONT_FMT_TXT_CMAP_SPARSE_TINY) {
-            uint16_t key = rcp;
-            uint16_t * p = _lv_utils_bsearch(&key, cmap->unicode_list, cmap->list_length,
-                                             sizeof(cmap->unicode_list[0]), unicode_list_compare);
-            if(!p) continue;
-
-            *cmap_index = i;
-            *char_index = p - cmap->unicode_list;
-            return true;
-        }
-        else if(cmap->type == LV_FONT_FMT_TXT_CMAP_SPARSE_FULL) {
-            uint16_t key = rcp;
-            uint16_t * p = _lv_utils_bsearch(&key, cmap->unicode_list, cmap->list_length,
-                                             sizeof(cmap->unicode_list[0]), unicode_list_compare);
-            if(!p) continue;
-
-            *cmap_index = i;
-            *char_index = p - cmap->unicode_list;
-            return true;
-        }
-    }
-    return 0;
-}
-
-static int32_t unicode_list_compare(const void * ref, const void * element)
-{
-    return ((int32_t)(*(uint16_t *) ref)) - ((int32_t)(*(uint16_t *) element));
-}
-
-static lv_font_key_t font_key_create(const lv_font_t * font_p, uint32_t cmap_index)
-{
-    lv_font_key_t key;
-    /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
-    SDL_memset(&key, 0, sizeof(key));
-    key.magic = LV_GPU_CACHE_KEY_MAGIC_FONT;
-    key.font_p = font_p;
-    key.cmap_index = cmap_index;
-    return key;
-}
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_line.c b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_line.c
deleted file mode 100644
index d1b3f362a..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_line.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @file lv_gpu_sdl_draw_line.c
- *
- * This implementation does not functioning properly so it's not enabled
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include LV_GPU_SDL_INCLUDE_PATH
-#include "../../core/lv_refr.h"
-#include "lv_gpu_sdl_utils.h"
-#include "lv_gpu_sdl_lru.h"
-#include "lv_gpu_sdl_texture_cache.h"
-#include "lv_gpu_sdl_mask.h"
-
-#ifndef M_PI
-    #include <math.h>
-#endif
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    lv_coord_t length;
-    lv_coord_t thickness;
-} lv_draw_line_key_t;
-
-static lv_draw_line_key_t line_key_create(lv_coord_t length, lv_coord_t thickness);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void lv_draw_line2(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip,
-                   const lv_draw_line_dsc_t * dsc)
-{
-    if(dsc->width == 0) return;
-    if(dsc->opa <= LV_OPA_MIN) return;
-
-    if(point1->x == point2->x && point1->y == point2->y) return;
-
-    lv_area_t clip_line;
-    clip_line.x1 = LV_MIN(point1->x, point2->x) - dsc->width / 2;
-    clip_line.x2 = LV_MAX(point1->x, point2->x) + dsc->width / 2;
-    clip_line.y1 = LV_MIN(point1->y, point2->y) - dsc->width / 2;
-    clip_line.y2 = LV_MAX(point1->y, point2->y) + dsc->width / 2;
-
-    if(!_lv_area_intersect(&clip_line, &clip_line, clip)) return;
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    SDL_Color line_color;
-    lv_color_to_sdl_color(&dsc->color, &line_color);
-
-    int length = lv_sdl_round(SDL_sqrt(SDL_pow(point2->y - point1->y + 1, 2) + SDL_pow(point2->x - point1->x + 1, 2)));
-    lv_coord_t thickness = dsc->width;
-    lv_draw_line_key_t key = line_key_create(length, thickness);
-    lv_area_t coords = {1, 1, length, dsc->width};
-    lv_area_t tex_coords;
-    lv_area_copy(&tex_coords, &coords);
-    lv_area_increase(&tex_coords, 1, 1);
-
-    SDL_Texture * texture = lv_gpu_draw_cache_get(&key, sizeof(key), NULL);
-
-    if(texture == NULL) {
-        lv_draw_mask_radius_param_t mask_rout_param;
-        lv_draw_mask_radius_init(&mask_rout_param, &coords, 0, false);
-        int16_t mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
-        texture = lv_sdl_gen_mask_texture(renderer, &tex_coords, &mask_rout_id, 1);
-        lv_draw_mask_remove_id(mask_rout_id);
-        SDL_assert(texture);
-        lv_gpu_draw_cache_put(&key, sizeof(key), texture);
-    }
-    double angle = SDL_atan2(point2->y - point1->y, point2->x - point1->x) * 180 / M_PI;
-
-    SDL_Rect clip_rect;
-    lv_area_to_sdl_rect(&clip_line, &clip_rect);
-
-
-    SDL_Texture * screen = SDL_GetRenderTarget(renderer);
-
-    SDL_Texture * content = lv_gpu_temp_texture_obtain(renderer, clip_rect.w, clip_rect.h);
-    SDL_SetTextureBlendMode(content, SDL_BLENDMODE_BLEND);
-    SDL_SetRenderTarget(renderer, content);
-    SDL_RenderSetClipRect(renderer, NULL);
-
-    //    /* Replace texture with clip mask */
-    SDL_Rect mask_rect = {.w = clip_rect.w, .h = clip_rect.h, .x = 0, .y = 0};
-    //    SDL_Texture *mask = lv_sdl_gen_mask_texture(renderer, &clip_line, NULL, 0);
-    //    SDL_SetTextureBlendMode(mask, SDL_BLENDMODE_NONE);
-    ////    SDL_RenderCopy(renderer, mask, NULL, &mask_rect);
-    //
-    //    SDL_SetTextureAlphaMod(texture, 0xFF);
-    //    SDL_SetTextureColorMod(texture, 0xFF, 0xFF, 0xFF);
-    //#if SDL_VERSION_ATLEAST(2, 0, 6)
-    //    SDL_BlendMode mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ZERO,
-    //                                                    SDL_BLENDOPERATION_ADD, SDL_BLENDFACTOR_ZERO,
-    //                                                    SDL_BLENDFACTOR_SRC_ALPHA, SDL_BLENDOPERATION_ADD);
-    //    SDL_SetTextureBlendMode(texture, mode);
-    //    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_NONE);
-    //#else
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_NONE);
-    //#endif
-
-    SDL_Rect coords_rect;
-    lv_area_to_sdl_rect(&tex_coords, &coords_rect);
-    coords_rect.x = 0 - coords_rect.h / 2;
-    coords_rect.y = 0 - coords_rect.h / 2;
-    SDL_Point center = {coords_rect.h / 2, coords_rect.h / 2};
-    SDL_RenderCopyEx(renderer, texture, NULL, &coords_rect, angle, &center, SDL_FLIP_NONE);
-    //
-    //    /* Draw composited part on screen */
-    SDL_SetTextureBlendMode(content, SDL_BLENDMODE_NONE);
-    SDL_SetTextureAlphaMod(content, dsc->opa);
-    SDL_SetTextureColorMod(content, line_color.r, line_color.g, line_color.b);
-    //
-    SDL_SetRenderTarget(renderer, screen);
-    //    SDL_RenderSetClipRect(renderer, &clip_rect);
-    SDL_RenderSetClipRect(renderer, NULL);
-    SDL_RenderCopy(renderer, content, &mask_rect, &clip_rect);
-    //    SDL_DestroyTexture(mask);
-}
-
-static lv_draw_line_key_t line_key_create(lv_coord_t length, lv_coord_t thickness)
-{
-    lv_draw_line_key_t key;
-    /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
-    SDL_memset(&key, 0, sizeof(key));
-    key.magic = LV_GPU_CACHE_KEY_MAGIC_LINE;
-    key.length = length;
-    key.thickness = thickness;
-    return key;
-}
-
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_rect.c b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_rect.c
deleted file mode 100644
index 689fb3d73..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_draw_rect.c
+++ /dev/null
@@ -1,733 +0,0 @@
-/**
- * @file lv_gpu_sdl_draw_rect.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-
-#include "../../draw/lv_draw_rect.h"
-#include "../../hal/lv_hal_disp.h"
-#include "../../core/lv_refr.h"
-#include "lv_gpu_sdl_utils.h"
-#include "lv_gpu_sdl_lru.h"
-#include "lv_gpu_sdl_texture_cache.h"
-#include "lv_gpu_sdl_mask.h"
-#include "lv_gpu_sdl_stack_blur.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    lv_coord_t radius;
-    lv_coord_t size;
-} lv_draw_rect_bg_key_t;
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    lv_coord_t radius;
-    lv_coord_t size;
-    lv_coord_t blur;
-} lv_draw_rect_shadow_key_t;
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    lv_coord_t rout, rin;
-    lv_coord_t thickness;
-    lv_coord_t size;
-    lv_border_side_t side;
-} lv_draw_rect_border_key_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-static void draw_bg_color(SDL_Renderer * renderer, const lv_area_t * coords, const lv_draw_rect_dsc_t * dsc);
-
-static void draw_bg_img(const lv_area_t * coords, const lv_area_t * clip,
-                        const lv_draw_rect_dsc_t * dsc);
-
-static void draw_border(SDL_Renderer * renderer, const lv_area_t * coords, const lv_draw_rect_dsc_t * dsc);
-
-static void draw_shadow(SDL_Renderer * renderer, const lv_area_t * coords, const lv_area_t * clip,
-                        const lv_draw_rect_dsc_t * dsc);
-
-static void draw_outline(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc);
-
-static void draw_border_generic(const lv_area_t * outer_area, const lv_area_t * inner_area, lv_coord_t rout,
-                                lv_coord_t rin, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
-
-static void draw_border_simple(const lv_area_t * outer_area, const lv_area_t * inner_area, lv_color_t color,
-                               lv_opa_t opa);
-
-static void draw_rect_masked(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc);
-
-static void draw_rect_masked_simple(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_rect_dsc_t * dsc);
-
-static void frag_render_corners(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
-                                const lv_area_t * coords);
-
-static void frag_render_borders(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
-                                const lv_area_t * coords);
-
-static void frag_render_center(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
-                               const lv_area_t * coords);
-
-static lv_draw_rect_bg_key_t rect_bg_key_create(lv_coord_t radius, lv_coord_t size);
-
-static lv_draw_rect_shadow_key_t rect_shadow_key_create(lv_coord_t radius, lv_coord_t size, lv_coord_t blur);
-
-static lv_draw_rect_border_key_t rect_border_key_create(lv_coord_t rout, lv_coord_t rin, lv_coord_t thickness,
-                                                        lv_coord_t size, lv_border_side_t side);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-#define SKIP_BORDER(dsc) ((dsc)->border_opa <= LV_OPA_MIN || (dsc)->border_width == 0 || (dsc)->border_side == LV_BORDER_SIDE_NONE || (dsc)->border_post)
-#define SKIP_SHADOW(dsc) ((dsc)->shadow_width == 0 || (dsc)->shadow_opa <= LV_OPA_MIN || ((dsc)->shadow_width == 1 && (dsc)->shadow_spread <= 0 && (dsc)->shadow_ofs_x == 0 && (dsc)->shadow_ofs_y == 0))
-#define SKIP_IMAGE(dsc) ((dsc)->bg_img_src == NULL || (dsc)->bg_img_opa <= LV_OPA_MIN)
-#define SKIP_OUTLINE(dsc) ((dsc)->outline_opa <= LV_OPA_MIN || (dsc)->outline_width == 0)
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void lv_draw_rect(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
-{
-    lv_area_t draw_area;
-    bool has_draw_content = _lv_area_intersect(&draw_area, coords, clip);
-
-    if(lv_draw_mask_is_any(&draw_area)) {
-        draw_rect_masked(coords, clip, dsc);
-        return;
-    }
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-
-    SDL_Rect clip_rect;
-    lv_area_to_sdl_rect(clip, &clip_rect);
-    SDL_RenderSetClipRect(renderer, &clip_rect);
-    draw_shadow(renderer, coords, clip, dsc);
-    /* Shadows and outlines will also draw in extended area */
-    if(has_draw_content) {
-        draw_bg_color(renderer, coords, dsc);
-        draw_bg_img(coords, clip, dsc);
-        draw_border(renderer, coords, dsc);
-    }
-    draw_outline(coords, clip, dsc);
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-static void draw_bg_color(SDL_Renderer * renderer, const lv_area_t * coords, const lv_draw_rect_dsc_t * dsc)
-{
-    SDL_Color bg_color;
-    lv_color_to_sdl_color(&dsc->bg_color, &bg_color);
-    lv_coord_t radius = dsc->radius;
-    if(radius > 0) {
-        /*A small texture with a quarter of the rect is enough*/
-        lv_coord_t bg_w = lv_area_get_width(coords), bg_h = lv_area_get_height(coords), bg_min = LV_MIN(bg_w, bg_h);
-        /* If size isn't times of 2, increase 1 px */
-        lv_coord_t min_half = bg_min % 2 == 0 ? bg_min / 2 : bg_min / 2 + 1;
-        lv_coord_t frag_size = radius == LV_RADIUS_CIRCLE ? min_half : LV_MIN(radius + 1, min_half);
-        lv_draw_rect_bg_key_t key = rect_bg_key_create(radius, frag_size);
-        lv_area_t coords_frag;
-        lv_area_copy(&coords_frag, coords);
-        lv_area_set_width(&coords_frag, frag_size);
-        lv_area_set_height(&coords_frag, frag_size);
-        SDL_Texture * texture = lv_gpu_draw_cache_get(&key, sizeof(key), NULL);
-        if(texture == NULL) {
-            lv_draw_mask_radius_param_t mask_rout_param;
-            lv_draw_mask_radius_init(&mask_rout_param, coords, radius, false);
-            int16_t mask_id = lv_draw_mask_add(&mask_rout_param, NULL);
-            texture = lv_sdl_gen_mask_texture(renderer, &coords_frag, &mask_id, 1);
-            lv_draw_mask_remove_id(mask_id);
-            SDL_assert(texture);
-            lv_gpu_draw_cache_put(&key, sizeof(key), texture);
-        }
-
-        SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-        SDL_SetTextureAlphaMod(texture, dsc->bg_opa);
-        SDL_SetTextureColorMod(texture, bg_color.r, bg_color.g, bg_color.b);
-        frag_render_corners(renderer, texture, frag_size, coords);
-        frag_render_borders(renderer, texture, frag_size, coords);
-        frag_render_center(renderer, texture, frag_size, coords);
-    }
-    else {
-        SDL_Rect coords_rect;
-        lv_area_to_sdl_rect(coords, &coords_rect);
-        SDL_SetRenderDrawColor(renderer, bg_color.r, bg_color.g, bg_color.b, dsc->bg_opa);
-        SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND);
-        SDL_RenderFillRect(renderer, &coords_rect);
-    }
-}
-
-static void draw_bg_img(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
-{
-    if(SKIP_IMAGE(dsc)) return;
-
-    lv_img_src_t src_type = lv_img_src_get_type(dsc->bg_img_src);
-    if(src_type == LV_IMG_SRC_SYMBOL) {
-        lv_point_t size;
-        lv_txt_get_size(&size, dsc->bg_img_src, dsc->bg_img_symbol_font, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE);
-        lv_area_t a;
-        a.x1 = coords->x1 + lv_area_get_width(coords) / 2 - size.x / 2;
-        a.x2 = a.x1 + size.x - 1;
-        a.y1 = coords->y1 + lv_area_get_height(coords) / 2 - size.y / 2;
-        a.y2 = a.y1 + size.y - 1;
-
-        lv_draw_label_dsc_t label_draw_dsc;
-        lv_draw_label_dsc_init(&label_draw_dsc);
-        label_draw_dsc.font = dsc->bg_img_symbol_font;
-        label_draw_dsc.color = dsc->bg_img_recolor;
-        label_draw_dsc.opa = dsc->bg_img_opa;
-        lv_draw_label(&a, clip, &label_draw_dsc, dsc->bg_img_src, NULL);
-    }
-    else {
-        lv_img_header_t header;
-        size_t key_size;
-        lv_gpu_sdl_cache_key_head_img_t * key = lv_gpu_sdl_img_cache_key_create(dsc->bg_img_src, 0, &key_size);
-        bool key_found;
-        lv_img_header_t * cache_header = NULL;
-        SDL_Texture * texture = lv_gpu_draw_cache_get_with_userdata(key, key_size, &key_found, (void **) &cache_header);
-        SDL_free(key);
-        if(texture) {
-            header = *cache_header;
-        }
-        else if(key_found || lv_img_decoder_get_info(dsc->bg_img_src, &header) != LV_RES_OK) {
-            /* When cache hit but with negative result, use default decoder. If still fail, return.*/
-            LV_LOG_WARN("Couldn't read the background image");
-            return;
-        }
-
-        lv_draw_img_dsc_t img_dsc;
-        lv_draw_img_dsc_init(&img_dsc);
-        img_dsc.blend_mode = dsc->blend_mode;
-        img_dsc.recolor = dsc->bg_img_recolor;
-        img_dsc.recolor_opa = dsc->bg_img_recolor_opa;
-        img_dsc.opa = dsc->bg_img_opa;
-
-        /*Center align*/
-        if(dsc->bg_img_tiled == false) {
-            lv_area_t area;
-            area.x1 = coords->x1 + lv_area_get_width(coords) / 2 - header.w / 2;
-            area.y1 = coords->y1 + lv_area_get_height(coords) / 2 - header.h / 2;
-            area.x2 = area.x1 + header.w - 1;
-            area.y2 = area.y1 + header.h - 1;
-
-            lv_draw_img(&area, clip, dsc->bg_img_src, &img_dsc);
-        }
-        else {
-            lv_area_t area;
-            area.y1 = coords->y1;
-            area.y2 = area.y1 + header.h - 1;
-
-            for(; area.y1 <= coords->y2; area.y1 += header.h, area.y2 += header.h) {
-
-                area.x1 = coords->x1;
-                area.x2 = area.x1 + header.w - 1;
-                for(; area.x1 <= coords->x2; area.x1 += header.w, area.x2 += header.w) {
-                    lv_draw_img(&area, clip, dsc->bg_img_src, &img_dsc);
-                }
-            }
-        }
-    }
-}
-
-static void draw_shadow(SDL_Renderer * renderer, const lv_area_t * coords, const lv_area_t * clip,
-                        const lv_draw_rect_dsc_t * dsc)
-{
-    /*Check whether the shadow is visible*/
-    if(SKIP_SHADOW(dsc)) return;
-
-    lv_coord_t sw = dsc->shadow_width;
-
-    lv_area_t core_area;
-    core_area.x1 = coords->x1 + dsc->shadow_ofs_x - dsc->shadow_spread;
-    core_area.x2 = coords->x2 + dsc->shadow_ofs_x + dsc->shadow_spread;
-    core_area.y1 = coords->y1 + dsc->shadow_ofs_y - dsc->shadow_spread;
-    core_area.y2 = coords->y2 + dsc->shadow_ofs_y + dsc->shadow_spread;
-
-    lv_area_t shadow_area;
-    shadow_area.x1 = core_area.x1 - sw / 2 - 1;
-    shadow_area.x2 = core_area.x2 + sw / 2 + 1;
-    shadow_area.y1 = core_area.y1 - sw / 2 - 1;
-    shadow_area.y2 = core_area.y2 + sw / 2 + 1;
-
-    lv_opa_t opa = dsc->shadow_opa;
-
-    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
-
-    /*Get clipped draw area which is the real draw area.
-     *It is always the same or inside `shadow_area`*/
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, &shadow_area, clip)) return;
-
-    SDL_Rect core_area_rect;
-    lv_area_to_sdl_rect(&shadow_area, &core_area_rect);
-
-    lv_coord_t radius = dsc->radius;
-    lv_coord_t sh_width = lv_area_get_width(&core_area);
-    lv_coord_t sh_height = lv_area_get_height(&core_area);
-    lv_coord_t sh_min = LV_MIN(sh_width, sh_height);
-    /* If size isn't times of 2, increase 1 px */
-    lv_coord_t min_half = sh_min % 2 == 0 ? sh_min / 2 : sh_min / 2 + 1;
-    /* No matter how big the shadow is, what we need is just a corner */
-    lv_coord_t frag_size = radius == LV_RADIUS_CIRCLE ? min_half : LV_MIN(radius + 1, min_half);
-    /* This is how big the corner is after blurring */
-    lv_coord_t blur_frag_size = frag_size + sw + 2;
-
-    lv_draw_rect_shadow_key_t key = rect_shadow_key_create(radius, frag_size, sw);
-
-    lv_area_t blur_frag;
-    lv_area_copy(&blur_frag, &shadow_area);
-    lv_area_set_width(&blur_frag, blur_frag_size * 2);
-    lv_area_set_height(&blur_frag, blur_frag_size * 2);
-    SDL_Texture * texture = lv_gpu_draw_cache_get(&key, sizeof(key), NULL);
-    if(texture == NULL) {
-        lv_draw_mask_radius_param_t mask_rout_param;
-        lv_draw_mask_radius_init(&mask_rout_param, &core_area, radius, false);
-        int16_t mask_id = lv_draw_mask_add(&mask_rout_param, NULL);
-        lv_opa_t * mask_buf = lv_draw_mask_dump(&blur_frag, &mask_id, 1);
-        lv_stack_blur_grayscale(mask_buf, lv_area_get_width(&blur_frag), lv_area_get_height(&blur_frag), sw / 2 + 1);
-        texture = lv_sdl_create_mask_texture(renderer, mask_buf, blur_frag_size, blur_frag_size,
-                                             lv_area_get_width(&blur_frag));
-        lv_mem_buf_release(mask_buf);
-        lv_draw_mask_remove_id(mask_id);
-        SDL_assert(texture);
-        lv_gpu_draw_cache_put(&key, sizeof(key), texture);
-    }
-
-    SDL_Color shadow_color;
-    lv_color_to_sdl_color(&dsc->shadow_color, &shadow_color);
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(texture, opa);
-    SDL_SetTextureColorMod(texture, shadow_color.r, shadow_color.g, shadow_color.b);
-
-    frag_render_corners(renderer, texture, blur_frag_size, &shadow_area);
-    frag_render_borders(renderer, texture, blur_frag_size, &shadow_area);
-    frag_render_center(renderer, texture, blur_frag_size, &shadow_area);
-}
-
-
-static void draw_border(SDL_Renderer * renderer, const lv_area_t * coords, const lv_draw_rect_dsc_t * dsc)
-{
-    if(SKIP_BORDER(dsc)) return;
-
-    SDL_Color border_color;
-    lv_color_to_sdl_color(&dsc->border_color, &border_color);
-
-
-    if(dsc->border_side != LV_BORDER_SIDE_FULL) {
-        SDL_SetRenderDrawColor(renderer, border_color.r, border_color.g, border_color.b, dsc->border_opa);
-        SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND);
-        for(int w = 0; w <= dsc->border_width; w++) {
-            if(dsc->border_side & LV_BORDER_SIDE_TOP) {
-                SDL_RenderDrawLine(renderer, coords->x1, coords->y1 + w, coords->x2, coords->y1 + w);
-            }
-            if(dsc->border_side & LV_BORDER_SIDE_BOTTOM) {
-                SDL_RenderDrawLine(renderer, coords->x1, coords->y2 - w, coords->x2, coords->y2 - w);
-            }
-            if(dsc->border_side & LV_BORDER_SIDE_LEFT) {
-                SDL_RenderDrawLine(renderer, coords->x1 + w, coords->y1, coords->x1 + w, coords->y2);
-            }
-            if(dsc->border_side & LV_BORDER_SIDE_RIGHT) {
-                SDL_RenderDrawLine(renderer, coords->x2 - w, coords->y1, coords->x2 - w, coords->y2);
-            }
-        }
-    }
-    else {
-        int32_t coords_w = lv_area_get_width(coords);
-        int32_t coords_h = lv_area_get_height(coords);
-        int32_t rout = dsc->radius;
-        int32_t short_side = LV_MIN(coords_w, coords_h);
-        if(rout > short_side >> 1) rout = short_side >> 1;
-
-        /*Get the inner area*/
-        lv_area_t area_inner;
-        lv_area_copy(&area_inner, coords);
-        area_inner.x1 += ((dsc->border_side & LV_BORDER_SIDE_LEFT) ? dsc->border_width : -(dsc->border_width + rout));
-        area_inner.x2 -= ((dsc->border_side & LV_BORDER_SIDE_RIGHT) ? dsc->border_width : -(dsc->border_width + rout));
-        area_inner.y1 += ((dsc->border_side & LV_BORDER_SIDE_TOP) ? dsc->border_width : -(dsc->border_width + rout));
-        area_inner.y2 -= ((dsc->border_side & LV_BORDER_SIDE_BOTTOM) ? dsc->border_width : -(dsc->border_width + rout));
-
-        lv_coord_t rin = rout - dsc->border_width;
-        if(rin < 0) rin = 0;
-        draw_border_generic(coords, &area_inner, rout, rin, dsc->border_color, dsc->border_opa,
-                            dsc->blend_mode);
-    }
-}
-
-static void draw_outline(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
-{
-    if(SKIP_OUTLINE(dsc)) return;
-
-    lv_opa_t opa = dsc->outline_opa;
-
-    if(opa > LV_OPA_MAX) opa = LV_OPA_COVER;
-
-    /*Get the inner radius*/
-    lv_area_t area_inner;
-    lv_area_copy(&area_inner, coords);
-
-    /*Extend the outline into the background area if it's overlapping the edge*/
-    lv_coord_t pad = (dsc->outline_pad == 0 ? (dsc->outline_pad - 1) : dsc->outline_pad);
-    area_inner.x1 -= pad;
-    area_inner.y1 -= pad;
-    area_inner.x2 += pad;
-    area_inner.y2 += pad;
-
-    lv_area_t area_outer;
-    lv_area_copy(&area_outer, &area_inner);
-
-    area_outer.x1 -= dsc->outline_width;
-    area_outer.x2 += dsc->outline_width;
-    area_outer.y1 -= dsc->outline_width;
-    area_outer.y2 += dsc->outline_width;
-
-    lv_area_t draw_area;
-    if(!_lv_area_intersect(&draw_area, &area_outer, clip)) return;
-
-    int32_t inner_w = lv_area_get_width(&area_inner);
-    int32_t inner_h = lv_area_get_height(&area_inner);
-    int32_t rin = dsc->radius;
-    int32_t short_side = LV_MIN(inner_w, inner_h);
-    if(rin > short_side >> 1) rin = short_side >> 1;
-
-    lv_coord_t rout = rin + dsc->outline_width;
-
-    draw_border_generic(&area_outer, &area_inner, rout, rin, dsc->outline_color, dsc->outline_opa,
-                        dsc->blend_mode);
-}
-
-static void draw_border_generic(const lv_area_t * outer_area, const lv_area_t * inner_area, lv_coord_t rout,
-                                lv_coord_t rin, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
-{
-    opa = opa >= LV_OPA_COVER ? LV_OPA_COVER : opa;
-
-    if(rout == 0 || rin == 0) {
-        draw_border_simple(outer_area, inner_area, color, opa);
-        return;
-    }
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    lv_coord_t border_width = lv_area_get_width(outer_area);
-    lv_coord_t border_height = lv_area_get_height(outer_area);
-    lv_coord_t border_min = LV_MIN(border_width, border_height);
-    lv_coord_t min_half = border_min % 2 == 0 ? border_min / 2 : border_min / 2 + 1;
-    lv_coord_t frag_size = rout == LV_RADIUS_CIRCLE ? min_half : LV_MIN(rout + 1, min_half);
-    lv_draw_rect_border_key_t key = rect_border_key_create(rout, rin, inner_area->x1 - outer_area->x1 + 1,
-                                                           frag_size, LV_BORDER_SIDE_FULL);
-    SDL_Texture * texture = lv_gpu_draw_cache_get(&key, sizeof(key), NULL);
-    if(texture == NULL) {
-        /*Create mask for the outer area*/
-        int16_t mask_ids[2] = {LV_MASK_ID_INV, LV_MASK_ID_INV};
-        lv_draw_mask_radius_param_t mask_rout_param;
-        if(rout > 0) {
-            lv_draw_mask_radius_init(&mask_rout_param, outer_area, rout, false);
-            mask_ids[0] = lv_draw_mask_add(&mask_rout_param, NULL);
-        }
-
-        /*Create mask for the inner mask*/
-        if(rin < 0) rin = 0;
-        lv_draw_mask_radius_param_t mask_rin_param;
-        lv_draw_mask_radius_init(&mask_rin_param, inner_area, rin, true);
-        mask_ids[1] = lv_draw_mask_add(&mask_rin_param, NULL);
-
-        lv_area_t frag_area;
-        lv_area_copy(&frag_area, outer_area);
-        lv_area_set_width(&frag_area, frag_size);
-        lv_area_set_height(&frag_area, frag_size);
-
-        texture = lv_sdl_gen_mask_texture(renderer, &frag_area, mask_ids, 2);
-
-        lv_draw_mask_remove_id(mask_ids[1]);
-        lv_draw_mask_remove_id(mask_ids[0]);
-        SDL_assert(texture);
-        lv_gpu_draw_cache_put(&key, sizeof(key), texture);
-    }
-
-    SDL_Rect outer_rect;
-    lv_area_to_sdl_rect(outer_area, &outer_rect);
-    SDL_Color color_sdl;
-    lv_color_to_sdl_color(&color, &color_sdl);
-
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(texture, opa);
-    SDL_SetTextureColorMod(texture, color_sdl.r, color_sdl.g, color_sdl.b);
-
-    frag_render_corners(renderer, texture, frag_size, outer_area);
-    frag_render_borders(renderer, texture, frag_size, outer_area);
-}
-
-static void draw_border_simple(const lv_area_t * outer_area, const lv_area_t * inner_area, lv_color_t color,
-                               lv_opa_t opa)
-{
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    SDL_Color color_sdl;
-    lv_color_to_sdl_color(&color, &color_sdl);
-
-    SDL_SetRenderDrawColor(renderer, color_sdl.r, color_sdl.g, color_sdl.b, opa);
-    SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND);
-    SDL_Rect simple_rect;
-    simple_rect.w = inner_area->x2 - outer_area->x1 + 1;
-    simple_rect.h = inner_area->y1 - outer_area->y1 + 1;
-    /*Top border*/
-    simple_rect.x = outer_area->x1;
-    simple_rect.y = outer_area->y1;
-    SDL_RenderFillRect(renderer, &simple_rect);
-    /*Bottom border*/
-    simple_rect.x = inner_area->x1;
-    simple_rect.y = inner_area->y2;
-    SDL_RenderFillRect(renderer, &simple_rect);
-
-    simple_rect.w = inner_area->x1 - outer_area->x1 + 1;
-    simple_rect.h = inner_area->y2 - outer_area->y1 + 1;
-    /*Left border*/
-    simple_rect.x = outer_area->x1;
-    simple_rect.y = inner_area->y1;
-    SDL_RenderFillRect(renderer, &simple_rect);
-    /*Right border*/
-    simple_rect.x = inner_area->x2;
-    simple_rect.y = outer_area->y1;
-    SDL_RenderFillRect(renderer, &simple_rect);
-
-}
-
-static void frag_render_corners(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
-                                const lv_area_t * coords)
-{
-    lv_coord_t bg_w = lv_area_get_width(coords);
-    lv_coord_t bg_h = lv_area_get_height(coords);
-    SDL_Rect srcrect = {0, 0, frag_size, frag_size};
-    SDL_Rect dstrect = {.x = coords->x1, .y = coords->y1, .w = frag_size, .h = frag_size};
-    /* Upper left */
-    SDL_RenderCopyEx(renderer, frag, &srcrect, &dstrect, 0, NULL, SDL_FLIP_NONE);
-    /* Upper right, clip right edge if too big */
-    srcrect.w = dstrect.w = LV_MIN(frag_size, bg_w - frag_size);
-    dstrect.x = coords->x2 - srcrect.w + 1;
-    SDL_RenderCopyEx(renderer, frag, &srcrect, &dstrect, 0, NULL, SDL_FLIP_HORIZONTAL);
-    /* Lower right, clip bottom edge if too big */
-    srcrect.h = dstrect.h = LV_MIN(frag_size, bg_h - frag_size);
-    dstrect.y = coords->y2 - srcrect.h + 1;
-    SDL_RenderCopyEx(renderer, frag, &srcrect, &dstrect, 0, NULL, SDL_FLIP_HORIZONTAL | SDL_FLIP_VERTICAL);
-    /* Lower left, right edge should not be clipped */
-    srcrect.w = dstrect.w = frag_size;
-    dstrect.x = coords->x1;
-    SDL_RenderCopyEx(renderer, frag, &srcrect, &dstrect, 0, NULL, SDL_FLIP_VERTICAL);
-}
-
-static void frag_render_borders(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size,
-                                const lv_area_t * coords)
-{
-    lv_coord_t bg_w = lv_area_get_width(coords);
-    lv_coord_t bg_h = lv_area_get_height(coords);
-    SDL_Rect srcrect;
-    SDL_Rect dstrect;
-    /* For top/bottom edges, stretch pixels on the right */
-    srcrect.h = dstrect.h = frag_size;
-    dstrect.w = bg_w - frag_size * 2;
-    /* Has space to fill */
-    if(dstrect.w > 0 && dstrect.h > 0) {
-        srcrect.w = 1;
-        srcrect.y = 0;
-        srcrect.x = frag_size - 1;
-        dstrect.x = coords->x1 + frag_size;
-        /* Top edge */
-        dstrect.y = coords->y1;
-        SDL_RenderCopy(renderer, frag, &srcrect, &dstrect);
-        /* Bottom edge */
-        dstrect.y = coords->y2 - frag_size + 1;
-        if(bg_h < frag_size * 2) {
-            /* Bottom edge will overlap with top, so decrease it by 1 px */
-            srcrect.h = dstrect.h = frag_size - 1;
-            dstrect.y += 1;
-        }
-        if(srcrect.h > 0) {
-            SDL_RenderCopyEx(renderer, frag, &srcrect, &dstrect, 0, NULL, SDL_FLIP_VERTICAL);
-        }
-    }
-    /* For left/right edges, stretch pixels on the bottom */
-    srcrect.w = dstrect.w = frag_size;
-    dstrect.h = bg_h - frag_size * 2;
-    if(dstrect.w > 0 && dstrect.h > 0) {
-        srcrect.h = 1;
-        srcrect.x = 0;
-        srcrect.y = frag_size - 1;
-        dstrect.y = coords->y1 + frag_size;
-        /* Left edge */
-        dstrect.x = coords->x1;
-        SDL_RenderCopy(renderer, frag, &srcrect, &dstrect);
-        /* Right edge */
-        dstrect.x = coords->x2 - frag_size + 1;
-        if(bg_w < frag_size * 2) {
-            /* Right edge will overlap with left, so decrease it by 1 px */
-            srcrect.w = dstrect.w = frag_size - 1;
-            dstrect.x += 1;
-        }
-        if(srcrect.w > 0) {
-            SDL_RenderCopyEx(renderer, frag, &srcrect, &dstrect, 0, NULL, SDL_FLIP_HORIZONTAL);
-        }
-    }
-}
-
-static void
-frag_render_center(SDL_Renderer * renderer, SDL_Texture * frag, lv_coord_t frag_size, const lv_area_t * coords)
-{
-    lv_coord_t bg_w = lv_area_get_width(coords);
-    lv_coord_t bg_h = lv_area_get_height(coords);
-    SDL_Rect dstrect = {coords->x1 + frag_size, coords->y1 + frag_size, bg_w - frag_size * 2, bg_h - frag_size * 2};
-    if(dstrect.w > 0 && dstrect.h > 0) {
-        SDL_Rect srcrect = {frag_size - 1, frag_size - 1, 1, 1};
-        SDL_RenderCopy(renderer, frag, &srcrect, &dstrect);
-    }
-}
-
-static void draw_rect_masked(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
-{
-    if(dsc->radius <= 0 && SKIP_BORDER(dsc) && SKIP_SHADOW(dsc) && SKIP_IMAGE(dsc) && SKIP_OUTLINE(dsc)) {
-        draw_rect_masked_simple(coords, clip, dsc);
-        return;
-    }
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    SDL_Texture * screen = SDL_GetRenderTarget(renderer);
-
-    lv_coord_t sw = dsc->shadow_width;
-
-    lv_area_t sh_area = *coords;
-    lv_area_increase(&sh_area, dsc->shadow_spread + sw / 2 + 1, dsc->shadow_spread + sw / 2 + 1);
-    lv_area_move(&sh_area, dsc->shadow_ofs_x, dsc->shadow_ofs_y);
-
-    lv_coord_t draw_w = lv_area_get_width(&sh_area);
-    lv_coord_t draw_h = lv_area_get_height(&sh_area);
-    /* Render drawing area to an offscreen texture */
-    SDL_Texture * content = lv_gpu_temp_texture_obtain(renderer, draw_w, draw_h);
-    SDL_assert(content);
-    SDL_SetTextureColorMod(content, 0xFF, 0xFF, 0xFF);
-    SDL_SetTextureAlphaMod(content, 0xFF);
-    SDL_SetTextureBlendMode(content, SDL_BLENDMODE_BLEND);
-
-    SDL_SetRenderTarget(renderer, content);
-    SDL_SetRenderDrawColor(renderer, 0xFF, 0xFF, 0xFF, 0x00);
-    SDL_RenderClear(renderer);
-    SDL_RenderSetClipRect(renderer, NULL);
-    lv_area_t content_coords;
-    lv_area_copy(&content_coords, coords);
-    lv_area_move(&content_coords, -sh_area.x1, -sh_area.y1);
-
-    draw_shadow(renderer, &content_coords, clip, dsc);
-    draw_bg_color(renderer, &content_coords, dsc);
-    draw_bg_img(&content_coords, clip, dsc);
-    draw_border(renderer, &content_coords, dsc);
-    draw_outline(&content_coords, clip, dsc);
-
-    SDL_Texture * clip_mask = lv_sdl_gen_mask_texture(renderer, &sh_area, NULL, 0);
-    SDL_Rect src_rect = {.w = draw_w, .h = draw_h, .x = 0, .y = 0};
-#if SDL_VERSION_ATLEAST(2, 0, 6)
-    SDL_BlendMode mode = SDL_ComposeCustomBlendMode(SDL_BLENDFACTOR_ZERO, SDL_BLENDFACTOR_ONE,
-                                                    SDL_BLENDOPERATION_ADD, SDL_BLENDFACTOR_ZERO,
-                                                    SDL_BLENDFACTOR_SRC_ALPHA, SDL_BLENDOPERATION_ADD);
-    SDL_SetTextureBlendMode(clip_mask, mode);
-    SDL_RenderCopy(renderer, clip_mask, NULL, &src_rect);
-#endif
-
-    SDL_Rect mask_rect;
-    SDL_Rect draw_rect;
-    lv_area_to_sdl_rect(&sh_area, &draw_rect);
-    lv_area_to_sdl_rect(clip, &mask_rect);
-
-    SDL_SetRenderTarget(renderer, screen);
-    SDL_RenderSetClipRect(renderer, &mask_rect);
-    SDL_RenderCopy(renderer, content, &src_rect, &draw_rect);
-    SDL_DestroyTexture(clip_mask);
-}
-
-static void draw_rect_masked_simple(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_rect_dsc_t * dsc)
-{
-    SDL_Color bg_color;
-    lv_color_to_sdl_color(&dsc->bg_color, &bg_color);
-
-    lv_disp_t * disp = _lv_refr_get_disp_refreshing();
-    SDL_Renderer * renderer = (SDL_Renderer *) disp->driver->user_data;
-
-    SDL_Surface * indexed = lv_sdl_apply_mask_surface(coords, NULL, 0);
-    SDL_Texture * texture = SDL_CreateTextureFromSurface(renderer, indexed);
-
-    SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(texture, dsc->bg_opa);
-    SDL_SetTextureColorMod(texture, bg_color.r, bg_color.g, bg_color.b);
-
-    SDL_Rect coords_rect, mask_rect;
-    lv_area_to_sdl_rect(coords, &coords_rect);
-    lv_area_to_sdl_rect(mask, &mask_rect);
-
-    SDL_RenderSetClipRect(renderer, &mask_rect);
-    SDL_RenderCopy(renderer, texture, NULL, &coords_rect);
-
-    SDL_DestroyTexture(texture);
-    SDL_FreeSurface(indexed);
-}
-
-static lv_draw_rect_bg_key_t rect_bg_key_create(lv_coord_t radius, lv_coord_t size)
-{
-    lv_draw_rect_bg_key_t key;
-    SDL_memset(&key, 0, sizeof(key));
-    key.magic = LV_GPU_CACHE_KEY_MAGIC_RECT_BG;
-    key.radius = radius;
-    key.size = size;
-    return key;
-}
-
-static lv_draw_rect_shadow_key_t rect_shadow_key_create(lv_coord_t radius, lv_coord_t size, lv_coord_t blur)
-{
-    lv_draw_rect_shadow_key_t key;
-    SDL_memset(&key, 0, sizeof(key));
-    key.magic = LV_GPU_CACHE_KEY_MAGIC_RECT_SHADOW;
-    key.radius = radius;
-    key.size = size;
-    key.blur = blur;
-    return key;
-}
-
-static lv_draw_rect_border_key_t rect_border_key_create(lv_coord_t rout, lv_coord_t rin, lv_coord_t thickness,
-                                                        lv_coord_t size, lv_border_side_t side)
-{
-    lv_draw_rect_border_key_t key;
-    /* VERY IMPORTANT! Padding between members is uninitialized, so we have to wipe them manually */
-    SDL_memset(&key, 0, sizeof(key));
-    key.magic = LV_GPU_CACHE_KEY_MAGIC_RECT_BORDER;
-    key.rout = rout;
-    key.rin = rin;
-    key.thickness = thickness;
-    key.size = size;
-    key.side = side;
-    return key;
-}
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_lru.h b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_lru.h
deleted file mode 100644
index a74e9eeac..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_lru.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file lv_gpu_sdl_lru.h
- *
- */
-
-#ifndef LV_LRU_H
-#define LV_LRU_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#include LV_GPU_SDL_INCLUDE_PATH
-
-#include <stdint.h>
-#include <time.h>
-
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-typedef enum {
-    LV_LRU_NO_ERROR = 0,
-    LV_LRU_MISSING_CACHE,
-    LV_LRU_MISSING_KEY,
-    LV_LRU_MISSING_VALUE,
-    LV_LRU_LOCK_ERROR,
-    LV_LRU_VALUE_TOO_LARGE
-} lruc_error;
-
-typedef void (lv_lru_free_t)(void * v);
-
-typedef struct lruc_item {
-    void * value;
-    void * key;
-    size_t value_length;
-    size_t key_length;
-    uint64_t access_count;
-    struct lruc_item * next;
-} lruc_item;
-
-typedef struct {
-    lruc_item ** items;
-    uint64_t access_count;
-    uint64_t free_memory;
-    uint64_t total_memory;
-    uint64_t average_item_length;
-    uint32_t hash_table_size;
-    time_t seed;
-    lv_lru_free_t * value_free;
-    lv_lru_free_t * key_free;
-    lruc_item * free_items;
-    SDL_mutex * mutex;
-} lv_lru_t;
-
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-lv_lru_t * lv_lru_new(uint64_t cache_size, uint32_t average_length, lv_lru_free_t * value_free,
-                      lv_lru_free_t * key_free);
-
-lruc_error lv_lru_free(lv_lru_t * cache);
-
-lruc_error lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, void * value, size_t value_length);
-
-lruc_error lv_lru_get(lv_lru_t * cache, const void * key, size_t key_size, void ** value);
-
-lruc_error lv_lru_delete(lv_lru_t * cache, const void * key, size_t key_size);
-
-/**********************
- *      MACROS
- **********************/
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_LRU_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_mask.h b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_mask.h
deleted file mode 100644
index 6dbd73b7d..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_mask.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @file lv_gpu_sdl_mask.h
- *
- */
-
-#ifndef LV_GPU_SDL_MASK_H
-#define LV_GPU_SDL_MASK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#include LV_GPU_SDL_INCLUDE_PATH
-
-#include "../../misc/lv_area.h"
-#include "../../misc/lv_color.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-
-lv_opa_t * lv_draw_mask_dump(const lv_area_t * coords, const int16_t * ids, int16_t ids_count);
-
-SDL_Surface * lv_sdl_create_mask_surface(lv_opa_t * pixels, lv_coord_t width, lv_coord_t height, lv_coord_t stride);
-
-SDL_Texture * lv_sdl_create_mask_texture(SDL_Renderer * renderer, lv_opa_t * pixels, lv_coord_t width,
-                                         lv_coord_t height, lv_coord_t stride);
-
-SDL_Surface * lv_sdl_apply_mask_surface(const lv_area_t * coords, const int16_t * ids, int16_t ids_count);
-
-SDL_Texture *
-lv_sdl_gen_mask_texture(SDL_Renderer * renderer, const lv_area_t * coords, const int16_t * ids, int16_t ids_count);
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_GPU_SDL_MASK_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_texture_cache.h b/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_texture_cache.h
deleted file mode 100644
index 5a20d542d..000000000
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_texture_cache.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file lv_gpu_sdl_texture_cache.h
- *
- */
-
-#ifndef LV_GPU_SDL_TEXTURE_CACHE_H
-#define LV_GPU_SDL_TEXTURE_CACHE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "../../lv_conf_internal.h"
-
-#include LV_GPU_SDL_INCLUDE_PATH
-#include "../../draw/lv_img_decoder.h"
-#include "../../misc/lv_area.h"
-#include "lv_gpu_sdl_lru.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-#define LV_GPU_SDL_DEC_DSC_TEXTURE_HEAD "@LVSDLTex"
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-typedef struct {
-    char head[8];
-    SDL_Texture * texture;
-} lv_gpu_sdl_dec_dsc_userdata_t;
-
-typedef enum {
-    LV_GPU_CACHE_KEY_MAGIC_ARC = 0x01,
-    LV_GPU_CACHE_KEY_MAGIC_IMG = 0x11,
-    LV_GPU_CACHE_KEY_MAGIC_LINE = 0x21,
-    LV_GPU_CACHE_KEY_MAGIC_RECT_BG = 0x31,
-    LV_GPU_CACHE_KEY_MAGIC_RECT_SHADOW = 0x32,
-    LV_GPU_CACHE_KEY_MAGIC_RECT_BORDER = 0x33,
-    LV_GPU_CACHE_KEY_MAGIC_FONT = 0x41,
-    LV_GPU_CACHE_KEY_TEMP = 0xFF,
-} lv_gpu_cache_key_magic_t;
-
-typedef enum {
-    LV_GPU_SDL_CACHE_FLAG_NONE = 0,
-    LV_GPU_SDL_CACHE_FLAG_MANAGED = 1,
-} lv_gpu_sdl_cache_flag_t;
-
-typedef struct {
-    lv_gpu_cache_key_magic_t magic;
-    lv_img_src_t type;
-    int32_t frame_id;
-} lv_gpu_sdl_cache_key_head_img_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-void _lv_gpu_sdl_texture_cache_init();
-
-void _lv_gpu_sdl_texture_cache_deinit();
-
-SDL_Texture * lv_gpu_draw_cache_get(const void * key, size_t key_length, bool * found);
-
-SDL_Texture * lv_gpu_draw_cache_get_with_userdata(const void * key, size_t key_length, bool * found, void ** userdata);
-
-void lv_gpu_draw_cache_put(const void * key, size_t key_length, SDL_Texture * texture);
-
-void lv_gpu_draw_cache_put_advanced(const void * key, size_t key_length, SDL_Texture * texture, void * userdata,
-                                    lv_lru_free_t userdata_free, lv_gpu_sdl_cache_flag_t flags);
-
-SDL_Texture * lv_gpu_temp_texture_obtain(SDL_Renderer * renderer, lv_coord_t width, lv_coord_t height);
-
-lv_gpu_sdl_cache_key_head_img_t * lv_gpu_sdl_img_cache_key_create(const void * src, int32_t frame_id, size_t * size);
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_GPU_SDL_TEXTURE_CACHE_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.c b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.c
index 43b7f4367..9a8e42d28 100644
--- a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.c
+++ b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.c
@@ -17,6 +17,11 @@
 #include "../core/lv_obj.h"
 #include "../core/lv_refr.h"
 #include "../core/lv_theme.h"
+#include "../draw/sdl/lv_draw_sdl.h"
+#include "../draw/sw/lv_draw_sw.h"
+#include "../draw/sdl/lv_draw_sdl.h"
+#include "../draw/stm32_dma2d/lv_gpu_stm32_dma2d.h"
+
 #if LV_USE_THEME_DEFAULT
     #include "../extra/themes/default/lv_theme_default.h"
 #endif
@@ -85,6 +90,30 @@ void lv_disp_drv_init(lv_disp_drv_t * driver)
     driver->screen_transp    = LV_COLOR_SCREEN_TRANSP;
     driver->dpi              = LV_DPI_DEF;
     driver->color_chroma_key = LV_COLOR_CHROMA_KEY;
+
+
+#if LV_USE_GPU_STM32_DMA2D
+    driver->draw_ctx_init = lv_draw_stm32_dma2d_ctx_init;
+    driver->draw_ctx_deinit = lv_draw_stm32_dma2d_ctx_init;
+    driver->draw_ctx_size = sizeof(lv_draw_stm32_dma2d_ctx_t);
+#elif LV_USE_GPU_NXP_PXP
+    driver->draw_ctx_init = lv_draw_nxp_pxp_init;
+    driver->draw_ctx_deinit = lv_draw_nxp_pxp_init;
+    driver->draw_ctx_size = sizeof(lv_draw_nxp_pxp_t);
+#elif LV_USE_GPU_NXP_VG_LITE
+    driver->draw_ctx_init = lv_draw_nxp_vglite_init;
+    driver->draw_ctx_deinit = lv_draw_nxp_vglite_init;
+    driver->draw_ctx_size = sizeof(lv_draw_nxp_vglite_t);
+#elif LV_USE_GPU_SDL
+    driver->draw_ctx_init = lv_draw_sdl_init_ctx;
+    driver->draw_ctx_deinit = lv_draw_sdl_deinit_ctx;
+    driver->draw_ctx_size = sizeof(lv_draw_sdl_ctx_t);
+#else
+    driver->draw_ctx_init = lv_draw_sw_init_ctx;
+    driver->draw_ctx_deinit = lv_draw_sw_init_ctx;
+    driver->draw_ctx_size = sizeof(lv_draw_sw_ctx_t);
+#endif
+
 }
 
 /**
@@ -126,6 +155,15 @@ lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver)
         return NULL;
     }
 
+    /*Create a draw context if not created yet*/
+    if(driver->draw_ctx == NULL) {
+        lv_draw_ctx_t * draw_ctx = lv_mem_alloc(driver->draw_ctx_size);
+        LV_ASSERT_MALLOC(draw_ctx);
+        if(draw_ctx == NULL) return NULL;
+        driver->draw_ctx_init(driver, draw_ctx);
+        driver->draw_ctx = draw_ctx;
+    }
+
     lv_memset_00(disp, sizeof(lv_disp_t));
 
     disp->driver = driver;
@@ -157,7 +195,8 @@ lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver)
     if(lv_theme_default_is_inited() == false) {
         disp->theme = lv_theme_default_init(disp, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED),
                                             LV_THEME_DEFAULT_DARK, LV_FONT_DEFAULT);
-    } else {
+    }
+    else {
         disp->theme = lv_theme_default_get();
     }
 #endif
@@ -259,7 +298,7 @@ void lv_disp_remove(lv_disp_t * disp)
     }
 
     _lv_ll_remove(&LV_GC_ROOT(_lv_disp_ll), disp);
-    lv_timer_del(disp->refr_timer);
+    if(disp->refr_timer) lv_timer_del(disp->refr_timer);
     lv_mem_free(disp);
 
     if(was_default) lv_disp_set_default(_lv_ll_get_head(&LV_GC_ROOT(_lv_disp_ll)));
@@ -461,7 +500,12 @@ LV_ATTRIBUTE_FLUSH_READY void lv_disp_flush_ready(lv_disp_drv_t * disp_drv)
     /*If the screen is transparent initialize it when the flushing is ready*/
 #if LV_COLOR_SCREEN_TRANSP
     if(disp_drv->screen_transp) {
-        lv_memset_00(disp_drv->draw_buf->buf_act, disp_drv->draw_buf->size * sizeof(lv_color32_t));
+        if(disp_drv->clear_cb) {
+            disp_drv->clear_cb(disp_drv, disp_drv->draw_buf->buf_act, disp_drv->draw_buf->size);
+        }
+        else {
+            lv_memset_00(disp_drv->draw_buf->buf_act, disp_drv->draw_buf->size * sizeof(lv_color32_t));
+        }
     }
 #endif
 
diff --git a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.h b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.h
index 3626a34ef..6abbab1f9 100644
--- a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.h
+++ b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.h
@@ -18,7 +18,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_hal.h"
-#include "../draw/lv_img_buf.h"
+#include "../draw/lv_draw.h"
 #include "../misc/lv_color.h"
 #include "../misc/lv_area.h"
 #include "../misc/lv_ll.h"
@@ -54,7 +54,6 @@ typedef struct _lv_disp_draw_buf_t {
     /*Internal, used by the library*/
     void * buf_act;
     uint32_t size; /*In pixel count*/
-    lv_area_t area;
     /*1: flushing is in progress. (It can't be a bit field because when it's cleared from IRQ Read-Modify-Write issue might occur)*/
     volatile int flushing;
     /*1: It was the last chunk to flush. (It can't be a bit field because when it's cleared from IRQ Read-Modify-Write issue might occur)*/
@@ -80,9 +79,12 @@ typedef struct _lv_disp_drv_t {
     lv_coord_t hor_res;         /**< Horizontal resolution.*/
     lv_coord_t ver_res;         /**< Vertical resolution.*/
 
-    lv_coord_t physical_hor_res;     /**< Horizontal resolution of the full / physical display. Set to -1 for fullscreen mode.*/
-    lv_coord_t physical_ver_res;     /**< Vertical resolution of the full / physical display. Set to -1 for fullscreen mode.*/
-    lv_coord_t offset_x;             /**< Horizontal offset from the full / physical display. Set to 0 for fullscreen mode.*/
+    lv_coord_t
+    physical_hor_res;     /**< Horizontal resolution of the full / physical display. Set to -1 for fullscreen mode.*/
+    lv_coord_t
+    physical_ver_res;     /**< Vertical resolution of the full / physical display. Set to -1 for fullscreen mode.*/
+    lv_coord_t
+    offset_x;             /**< Horizontal offset from the full / physical display. Set to 0 for fullscreen mode.*/
     lv_coord_t offset_y;             /**< Vertical offset from the full / physical display. Set to 0 for fullscreen mode.*/
 
     /** Pointer to a buffer initialized with `lv_disp_draw_buf_init()`.
@@ -113,6 +115,9 @@ typedef struct _lv_disp_drv_t {
     void (*set_px_cb)(struct _lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
                       lv_color_t color, lv_opa_t opa);
 
+    void (*clear_cb)(struct _lv_disp_drv_t * disp_drv, uint8_t * buf, uint32_t size);
+
+
     /** OPTIONAL: Called after every refresh cycle to tell the rendering and flushing time + the
      * number of flushed pixels*/
     void (*monitor_cb)(struct _lv_disp_drv_t * disp_drv, uint32_t time, uint32_t px);
@@ -125,20 +130,18 @@ typedef struct _lv_disp_drv_t {
     /** OPTIONAL: Called when lvgl needs any CPU cache that affects rendering to be cleaned*/
     void (*clean_dcache_cb)(struct _lv_disp_drv_t * disp_drv);
 
-    /** OPTIONAL: called to wait while the gpu is working*/
-    void (*gpu_wait_cb)(struct _lv_disp_drv_t * disp_drv);
-
     /** OPTIONAL: called when driver parameters are updated */
     void (*drv_update_cb)(struct _lv_disp_drv_t * disp_drv);
 
-    /** OPTIONAL: Fill a memory with a color (GPU only)*/
-    void (*gpu_fill_cb)(struct _lv_disp_drv_t * disp_drv, lv_color_t * dest_buf, lv_coord_t dest_width,
-                        const lv_area_t * fill_area, lv_color_t color);
-
     /** On CHROMA_KEYED images this color will be transparent.
      * `LV_COLOR_CHROMA_KEY` by default. (lv_conf.h)*/
     lv_color_t color_chroma_key;
 
+    lv_draw_ctx_t * draw_ctx;
+    void (*draw_ctx_init)(struct _lv_disp_drv_t * disp_drv, lv_draw_ctx_t * draw_ctx);
+    void (*draw_ctx_deinit)(struct _lv_disp_drv_t * disp_drv, lv_draw_ctx_t * draw_ctx);
+    size_t draw_ctx_size;
+
 #if LV_USE_USER_DATA
     void * user_data; /**< Custom display driver user data*/
 #endif
@@ -173,7 +176,6 @@ uint8_t del_prev  :
     lv_opa_t bg_opa;                /**<Opacity of the background color or wallpaper*/
     lv_color_t bg_color;            /**< Default display color when screens are transparent*/
     const void * bg_img;            /**< An image source to display as wallpaper*/
-    void (*bg_fn)(lv_area_t*);/**< A function to handle drawing*/
 
     /** Invalidated (marked to redraw) areas*/
     lv_area_t inv_areas[LV_INV_BUF_SIZE];
diff --git a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.c b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.c
index 76b02cec7..4d77083e8 100644
--- a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.c
+++ b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.c
@@ -106,7 +106,42 @@ lv_indev_t * lv_indev_drv_register(lv_indev_drv_t * driver)
  */
 void lv_indev_drv_update(lv_indev_t * indev, lv_indev_drv_t * new_drv)
 {
+    LV_ASSERT_NULL(indev);
+    LV_ASSERT_NULL(indev->driver);
+    LV_ASSERT_NULL(indev->driver->read_timer);
+    lv_timer_del(indev->driver->read_timer);
+
+    LV_ASSERT_NULL(new_drv);
+    if(new_drv->disp == NULL) {
+        new_drv->disp = lv_disp_get_default();
+    }
+    if(new_drv->disp == NULL) {
+        LV_LOG_WARN("lv_indev_drv_register: no display registered hence can't attach the indev to "
+                    "a display");
+        indev->proc.disabled = true;
+        return;
+    }
+
     indev->driver = new_drv;
+    indev->driver->read_timer = lv_timer_create(lv_indev_read_timer_cb, LV_INDEV_DEF_READ_PERIOD, indev);
+    indev->proc.reset_query   = 1;
+}
+
+/**
+* Remove the provided input device. Make sure not to use the provided input device afterwards anymore.
+* @param indev pointer to delete
+*/
+void lv_indev_delete(lv_indev_t * indev)
+{
+    LV_ASSERT_NULL(indev);
+    LV_ASSERT_NULL(indev->driver);
+    LV_ASSERT_NULL(indev->driver->read_timer);
+    /*Clean up the read timer first*/
+    lv_timer_del(indev->driver->read_timer);
+    /*Remove the input device from the list*/
+    _lv_ll_remove(&LV_GC_ROOT(_lv_indev_ll), indev);
+    /*Free the memory of the input device*/
+    lv_mem_free(indev);
 }
 
 /**
diff --git a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.h b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.h
index fcda8f9f6..ca51a08c2 100644
--- a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.h
+++ b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.h
@@ -207,6 +207,12 @@ lv_indev_t * lv_indev_drv_register(struct _lv_indev_drv_t * driver);
  */
 void lv_indev_drv_update(lv_indev_t * indev, struct _lv_indev_drv_t * new_drv);
 
+/**
+* Remove the provided input device. Make sure not to use the provided input device afterwards anymore.
+* @param indev pointer to delete
+*/
+void lv_indev_delete(lv_indev_t * indev);
+
 /**
  * Get the next input device.
  * @param indev pointer to the current input device. NULL to initialize.
diff --git a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.c b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.c
index e109835ce..c12a5942e 100644
--- a/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.c
+++ b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.c
@@ -29,8 +29,8 @@
  *  STATIC VARIABLES
  **********************/
 #if !LV_TICK_CUSTOM
-static uint32_t sys_time = 0;
-static volatile uint8_t tick_irq_flag;
+    static uint32_t sys_time = 0;
+    static volatile uint8_t tick_irq_flag;
 #endif
 
 /**********************
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_anim.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim.h
index 6f51bf001..18317eb38 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_anim.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim.h
@@ -205,7 +205,7 @@ static inline void lv_anim_set_start_cb(lv_anim_t * a, lv_anim_start_cb_t start_
 
 /**
  * Set a function to use the current value of the variable and make start and end value
- * relative the the returned current value.
+ * relative to the returned current value.
  * @param a             pointer to an initialized `lv_anim_t` variable
  * @param get_value_cb  a function call when the animation starts
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.c
index 930b6952c..08d5321fb 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.c
@@ -170,7 +170,7 @@ uint32_t lv_anim_timeline_get_playtime(lv_anim_timeline_t * at)
     uint32_t playtime = 0;
     for(uint32_t i = 0; i < at->anim_dsc_cnt; i++) {
         uint32_t end = lv_anim_get_playtime(&at->anim_dsc[i].anim);
-        if (end == LV_ANIM_PLAYTIME_INFINITE)
+        if(end == LV_ANIM_PLAYTIME_INFINITE)
             return end;
         end += at->anim_dsc[i].start_time;
         if(end > playtime) {
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.h
index ed8782e19..d4dd0fcf3 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim_timeline.h
@@ -32,7 +32,7 @@ typedef struct _lv_anim_timeline_t lv_anim_timeline_t;
 **********************/
 
 /**
- * Create a animation timeline.
+ * Create an animation timeline.
  * @return pointer to the animation timeline.
  */
 lv_anim_timeline_t * lv_anim_timeline_create(void);
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_area.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_area.c
index 08a8f16e1..7c66a9b33 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_area.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_area.c
@@ -319,6 +319,11 @@ bool _lv_area_is_out(const lv_area_t * aout_p, const lv_area_t * aholder_p, lv_c
     return true;
 }
 
+bool _lv_area_is_equal(const lv_area_t * a, const lv_area_t * b)
+{
+    return a->x1 == b->x1 && a->x2 == b->x2 && a->y1 == b->y1 && a->y2 == b->y2;
+}
+
 /**
  * Align an area to an other
  * @param base an are where the other will be aligned
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_area.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_area.h
index e2a70eb4c..542d86bc5 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_area.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_area.h
@@ -221,6 +221,13 @@ bool _lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, lv_coo
  */
 bool _lv_area_is_out(const lv_area_t * aout_p, const lv_area_t * aholder_p, lv_coord_t radius);
 
+/**
+ * Check if 2 area is the same
+ * @param a pointer to an area
+ * @param b pointer to another area
+ */
+bool _lv_area_is_equal(const lv_area_t * a, const lv_area_t * b);
+
 /**
  * Align an area to an other
  * @param base an are where the other will be aligned
@@ -234,9 +241,9 @@ void lv_area_align(const lv_area_t * base, lv_area_t * to_align, lv_align_t alig
  **********************/
 
 #if LV_USE_LARGE_COORD
-#define _LV_COORD_TYPE_SHIFT    (29)
+#define _LV_COORD_TYPE_SHIFT    (29U)
 #else
-#define _LV_COORD_TYPE_SHIFT    (13)
+#define _LV_COORD_TYPE_SHIFT    (13U)
 #endif
 
 #define _LV_COORD_TYPE_MASK     (3 << _LV_COORD_TYPE_SHIFT)
@@ -247,7 +254,7 @@ void lv_area_align(const lv_area_t * base, lv_area_t * to_align, lv_align_t alig
 #define _LV_COORD_TYPE_SPEC     (1 << _LV_COORD_TYPE_SHIFT)
 #define _LV_COORD_TYPE_PX_NEG   (3 << _LV_COORD_TYPE_SHIFT)
 
-#define LV_COORD_IS_PX(x)       (_LV_COORD_TYPE(x) == _LV_COORD_TYPE_PX) || \
+#define LV_COORD_IS_PX(x)       (_LV_COORD_TYPE(x) == _LV_COORD_TYPE_PX || \
                                  _LV_COORD_TYPE(x) == _LV_COORD_TYPE_PX_NEG ? true : false)
 #define LV_COORD_IS_SPEC(x)     (_LV_COORD_TYPE(x) == _LV_COORD_TYPE_SPEC ? true : false)
 
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.c
index 3b084d3d7..b207f9d9e 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.c
@@ -440,13 +440,13 @@ static lv_base_dir_t get_next_run(const char * txt, lv_base_dir_t base_dir, uint
     /*Find the first strong char. Skip the neutrals*/
     while(dir == LV_BASE_DIR_NEUTRAL || dir == LV_BASE_DIR_WEAK) {
         letter = _lv_txt_encoded_next(txt, &i);
-        
+
         pos_conv_i++;
         dir = lv_bidi_get_letter_dir(letter);
         if(dir == LV_BASE_DIR_NEUTRAL)  dir = bracket_process(txt, i, max_len, letter, base_dir);
- 
-        if(dir==LV_BASE_DIR_LTR || dir==LV_BASE_DIR_RTL)  break;
-         
+
+        if(dir == LV_BASE_DIR_LTR || dir == LV_BASE_DIR_RTL)  break;
+
         if(i >= max_len || txt[i] == '\0' || txt[i] == '\n' || txt[i] == '\r') {
             *len = i;
             *pos_conv_len = pos_conv_i;
@@ -468,14 +468,14 @@ static lv_base_dir_t get_next_run(const char * txt, lv_base_dir_t base_dir, uint
         pos_conv_i++;
         next_dir  = lv_bidi_get_letter_dir(letter);
         if(next_dir == LV_BASE_DIR_NEUTRAL)  next_dir = bracket_process(txt, i, max_len, letter, base_dir);
-   
-        if(next_dir == LV_BASE_DIR_WEAK){
-             if(run_dir == LV_BASE_DIR_RTL){
-                 if(base_dir == LV_BASE_DIR_RTL){
-                     next_dir = LV_BASE_DIR_LTR;
-                 }
-             }
-         }
+
+        if(next_dir == LV_BASE_DIR_WEAK) {
+            if(run_dir == LV_BASE_DIR_RTL) {
+                if(base_dir == LV_BASE_DIR_RTL) {
+                    next_dir = LV_BASE_DIR_LTR;
+                }
+            }
+        }
 
         /*New dir found?*/
         if((next_dir == LV_BASE_DIR_RTL || next_dir == LV_BASE_DIR_LTR) && next_dir != run_dir) {
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_color.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_color.h
index ca226102a..37445cc5f 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_color.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_color.h
@@ -596,7 +596,36 @@ static inline lv_color_t lv_color_make(uint8_t r, uint8_t g, uint8_t b)
 
 static inline lv_color_t lv_color_hex(uint32_t c)
 {
+#if LV_COLOR_DEPTH == 16
+    lv_color_t r;
+#if LV_COLOR_16_SWAP == 0
+    /* Convert a 4 bytes per pixel in format ARGB32 to R5G6B5 format
+        naive way (by calling lv_color_make with components):
+                    r = ((c & 0xFF0000) >> 19)
+                    g = ((c & 0xFF00) >> 10)
+                    b = ((c & 0xFF) >> 3)
+                    rgb565 = (r << 11) | (g << 5) | b
+        That's 3 mask, 5 bitshift and 2 or operations
+
+        A bit better:
+                    r = ((c & 0xF80000) >> 8)
+                    g = ((c & 0xFC00) >> 5)
+                    b = ((c & 0xFF) >> 3)
+                    rgb565 = r | g | b
+        That's 3 mask, 3 bitshifts and 2 or operations */
+    r.full = (uint16_t)(((c & 0xF80000) >> 8) | ((c & 0xFC00) >> 5) | ((c & 0xFF) >> 3));
+#else
+    /* We want: rrrr rrrr GGGg gggg bbbb bbbb => gggb bbbb rrrr rGGG */
+    r.full = (uint16_t)(((c & 0xF80000) >> 16) | ((c & 0xFC00) >> 13) | ((c & 0x1C00) << 3) | ((c & 0xF8) << 5));
+#endif
+    return r;
+#elif LV_COLOR_DEPTH == 32
+    lv_color_t r;
+    r.full = c | 0xFF000000;
+    return r;
+#else /*LV_COLOR_DEPTH == 8*/
     return lv_color_make((uint8_t)((c >> 16) & 0xFF), (uint8_t)((c >> 8) & 0xFF), (uint8_t)(c & 0xFF));
+#endif
 }
 
 static inline lv_color_t lv_color_hex3(uint32_t c)
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.c
index 8011b4cf4..5a7afc59a 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.c
@@ -8,24 +8,15 @@
  *********************/
 #include "lv_fs.h"
 
-#include <string.h>
-#include "lv_assert.h"
+#include "../misc/lv_assert.h"
 #include "lv_ll.h"
+#include <string.h>
 #include "lv_gc.h"
 
 /*********************
  *      DEFINES
  *********************/
 
-/**
- * "free" is used as a function pointer (in lv_fs_drv_t).
- * We must make sure "free" was not defined to a platform specific
- * free function, otherwise compilation would fail.
- */
-#ifdef free
-    #undef free
-#endif
-
 /**********************
  *      TYPEDEFS
  **********************/
@@ -100,6 +91,12 @@ lv_fs_res_t lv_fs_open(lv_fs_file_t * file_p, const char * path, lv_fs_mode_t mo
     file_p->drv = drv;
     file_p->file_d = file_d;
 
+    if(drv->cache_size) {
+        file_p->cache = lv_mem_alloc(sizeof(lv_fs_file_cache_t));
+        LV_ASSERT_MALLOC(file_p->cache);
+        lv_memset_00(file_p->cache, sizeof(lv_fs_file_cache_t));
+    }
+
     return LV_FS_RES_OK;
 }
 
@@ -115,8 +112,91 @@ lv_fs_res_t lv_fs_close(lv_fs_file_t * file_p)
 
     lv_fs_res_t res = file_p->drv->close_cb(file_p->drv, file_p->file_d);
 
+    if(file_p->drv->cache_size && file_p->cache) {
+        if(file_p->cache->buffer) {
+            lv_mem_free(file_p->cache->buffer);
+        }
+
+        lv_mem_free(file_p->cache);
+    }
+
     file_p->file_d = NULL;
     file_p->drv    = NULL;
+    file_p->cache  = NULL;
+
+    return res;
+}
+
+static lv_fs_res_t lv_fs_read_cached(lv_fs_file_t * file_p, char * buf, uint32_t btr, uint32_t * br)
+{
+    lv_fs_res_t res = LV_FS_RES_OK;
+    uint32_t file_position = file_p->cache->file_position;
+    uint32_t start = file_p->cache->start;
+    uint32_t end = file_p->cache->end;
+    char * buffer = file_p->cache->buffer;
+    uint16_t buffer_size = file_p->drv->cache_size;
+
+    if(start <= file_position && file_position < end) {
+        /* Data can be read from cache buffer */
+
+        uint16_t buffer_offset = file_position - start;
+        uint16_t buffer_remaining_length = buffer_size - buffer_offset;
+
+        if(btr <= buffer_remaining_length) {
+            /*Data is in cache buffer, and buffer end not reached, no need to read from FS*/
+            lv_memcpy(buf, buffer + buffer_offset, btr);
+        }
+        else {
+            /*First part of data is in cache buffer, but we need to read rest of data from FS*/
+            lv_memcpy(buf, buffer + buffer_offset, buffer_remaining_length);
+
+            if(btr > buffer_size) {
+                /*If remaining data chuck is bigger than buffer size, then do not use cache, instead read it directly from FS*/
+                res = file_p->drv->read_cb(file_p->drv, file_p->file_d, (void *)(buf + buffer_remaining_length),
+                                           btr - buffer_remaining_length, br);
+            }
+            else {
+                /*If remaining data chunk is smaller than buffer size, then read into cache buffer*/
+                uint32_t bytes_read_to_buffer = 0;
+
+                /*Read into cache buffer:*/
+                res = file_p->drv->read_cb(file_p->drv, file_p->file_d, (void *)buffer, buffer_size, &bytes_read_to_buffer);
+                file_p->cache->start = file_p->cache->end + 1;
+                file_p->cache->end = file_p->cache->start + bytes_read_to_buffer;
+
+                uint16_t data_chunk_remaining = btr - buffer_remaining_length;
+                memcpy(buf + buffer_remaining_length, buffer, data_chunk_remaining);
+            }
+        }
+    }
+    else {
+        /*Data is not in cache buffer*/
+
+        if(btr > buffer_size) {
+            /*If bigger data is requested, then do not use cache, instead read it directly*/
+            res = file_p->drv->read_cb(file_p->drv, file_p->file_d, (void *)buf, btr, br);
+        }
+        else {
+            /*If small data is requested, then read from FS into cache buffer*/
+            if(buffer == NULL) {
+                file_p->cache->buffer = lv_mem_alloc(buffer_size);
+                LV_ASSERT_MALLOC(file_p->cache->buffer);
+                buffer = file_p->cache->buffer;
+            }
+
+            uint32_t bytes_read_to_buffer = 0;
+            res = file_p->drv->read_cb(file_p->drv, file_p->file_d, (void *)buffer, buffer_size, &bytes_read_to_buffer);
+            file_p->cache->start = file_position;
+            file_p->cache->end = file_p->cache->start + bytes_read_to_buffer;
+
+            memcpy(buf, buffer, btr);
+        }
+    }
+
+    if(res == LV_FS_RES_OK) {
+        *br = btr;
+        file_p->cache->file_position += btr;
+    }
 
     return res;
 }
@@ -128,7 +208,15 @@ lv_fs_res_t lv_fs_read(lv_fs_file_t * file_p, void * buf, uint32_t btr, uint32_t
     if(file_p->drv->read_cb == NULL) return LV_FS_RES_NOT_IMP;
 
     uint32_t br_tmp = 0;
-    lv_fs_res_t res = file_p->drv->read_cb(file_p->drv, file_p->file_d, buf, btr, &br_tmp);
+    lv_fs_res_t res;
+
+    if(file_p->drv->cache_size) {
+        res = lv_fs_read_cached(file_p, (char *)buf, btr, &br_tmp);
+    }
+    else {
+        res = file_p->drv->read_cb(file_p->drv, file_p->file_d, buf, btr, &br_tmp);
+    }
+
     if(br != NULL) *br = br_tmp;
 
     return res;
@@ -163,22 +251,73 @@ lv_fs_res_t lv_fs_seek(lv_fs_file_t * file_p, uint32_t pos, lv_fs_whence_t whenc
         return LV_FS_RES_NOT_IMP;
     }
 
-    return file_p->drv->seek_cb(file_p->drv, file_p->file_d, pos, whence);
+    lv_fs_res_t res = LV_FS_RES_OK;
+    if(file_p->drv->cache_size) {
+        switch(whence) {
+            case LV_FS_SEEK_SET: {
+                    file_p->cache->file_position = pos;
+
+                    /*FS seek if new position is outside cache buffer*/
+                    if(file_p->cache->file_position < file_p->cache->start || file_p->cache->file_position > file_p->cache->end) {
+                        res = file_p->drv->seek_cb(file_p->drv, file_p->file_d, file_p->cache->file_position, LV_FS_SEEK_SET);
+                    }
+
+                    break;
+                }
+            case LV_FS_SEEK_CUR: {
+                    file_p->cache->file_position += pos;
+
+                    /*FS seek if new position is outside cache buffer*/
+                    if(file_p->cache->file_position < file_p->cache->start || file_p->cache->file_position > file_p->cache->end) {
+                        res = file_p->drv->seek_cb(file_p->drv, file_p->file_d, file_p->cache->file_position, LV_FS_SEEK_SET);
+                    }
+
+                    break;
+                }
+            case LV_FS_SEEK_END: {
+                    /*Because we don't know the file size, we do a little trick: do a FS seek, then get new file position from FS*/
+                    res = file_p->drv->seek_cb(file_p->drv, file_p->file_d, pos, whence);
+                    if(res == LV_FS_RES_OK) {
+                        uint32_t tmp_position;
+                        res = file_p->drv->tell_cb(file_p->drv, file_p->file_d, &tmp_position);
+
+                        if(res == LV_FS_RES_OK) {
+                            file_p->cache->file_position = tmp_position;
+                        }
+                    }
+                    break;
+                }
+        }
+    }
+    else {
+        res = file_p->drv->seek_cb(file_p->drv, file_p->file_d, pos, whence);
+    }
+
+    return res;
 }
 
 lv_fs_res_t lv_fs_tell(lv_fs_file_t * file_p, uint32_t * pos)
 {
-    *pos = 0;
-
     if(file_p->drv == NULL) {
+        *pos = 0;
         return LV_FS_RES_INV_PARAM;
     }
 
     if(file_p->drv->tell_cb == NULL) {
+        *pos = 0;
         return LV_FS_RES_NOT_IMP;
     }
 
-    return file_p->drv->tell_cb(file_p->drv, file_p->file_d, pos);
+    lv_fs_res_t res;
+    if(file_p->drv->cache_size) {
+        *pos = file_p->cache->file_position;
+        res = LV_FS_RES_OK;
+    }
+    else {
+        res = file_p->drv->tell_cb(file_p->drv, file_p->file_d, pos);
+    }
+
+    return res;
 }
 
 lv_fs_res_t lv_fs_dir_open(lv_fs_dir_t * rddir_p, const char * path)
@@ -217,17 +356,19 @@ lv_fs_res_t lv_fs_dir_open(lv_fs_dir_t * rddir_p, const char * path)
 
 lv_fs_res_t lv_fs_dir_read(lv_fs_dir_t * rddir_p, char * fn)
 {
-    fn[0] = '\0';
-
     if(rddir_p->drv == NULL || rddir_p->dir_d == NULL) {
+        fn[0] = '\0';
         return LV_FS_RES_INV_PARAM;
     }
 
     if(rddir_p->drv->dir_read_cb == NULL) {
+        fn[0] = '\0';
         return LV_FS_RES_NOT_IMP;
     }
 
-    return rddir_p->drv->dir_read_cb(rddir_p->drv, rddir_p->dir_d, fn);
+    lv_fs_res_t res = rddir_p->drv->dir_read_cb(rddir_p->drv, rddir_p->dir_d, fn);
+
+    return res;
 }
 
 lv_fs_res_t lv_fs_dir_close(lv_fs_dir_t * rddir_p)
@@ -296,10 +437,10 @@ const char * lv_fs_get_ext(const char * fn)
 {
     size_t i;
     for(i = strlen(fn); i > 0; i--) {
-        if(fn[i - 1] == '.') {
-            return &fn[i];
+        if(fn[i] == '.') {
+            return &fn[i + 1];
         }
-        else if(fn[i - 1] == '/' || fn[i - 1] == '\\') {
+        else if(fn[i] == '/' || fn[i] == '\\') {
             return ""; /*No extension if a '\' or '/' found*/
         }
     }
@@ -325,12 +466,11 @@ char * lv_fs_up(char * path)
 
     size_t i;
     for(i = len; i > 0; i--) {
-        if(path[i - 1] == '/' || path[i - 1] == '\\') {
-            path[i - 1] = '\0';
-            break;
-        }
+        if(path[i] == '/' || path[i] == '\\') break;
     }
 
+    if(i > 0) path[i] = '\0';
+
     return path;
 }
 
@@ -351,12 +491,14 @@ const char * lv_fs_get_last(const char * path)
 
     size_t i;
     for(i = len; i > 0; i--) {
-        if(path[i - 1] == '/' || path[i - 1] == '\\') break;
+        if(path[i] == '/' || path[i] == '\\') break;
     }
 
-    return &path[i];
-}
+    /*No '/' or '\' in the path so return with path itself*/
+    if(i == 0) return path;
 
+    return &path[i + 1];
+}
 /**********************
  *   STATIC FUNCTIONS
  **********************/
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.h
index 9afc2bf57..0a9b24104 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.h
@@ -69,6 +69,7 @@ typedef enum {
 
 typedef struct _lv_fs_drv_t {
     char letter;
+    uint16_t cache_size;
     bool (*ready_cb)(struct _lv_fs_drv_t * drv);
 
     void * (*open_cb)(struct _lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode);
@@ -87,9 +88,17 @@ typedef struct _lv_fs_drv_t {
 #endif
 } lv_fs_drv_t;
 
+typedef struct {
+    uint32_t start;
+    uint32_t end;
+    uint32_t file_position;
+    void * buffer;
+} lv_fs_file_cache_t;
+
 typedef struct {
     void * file_d;
     lv_fs_drv_t * drv;
+    lv_fs_file_cache_t * cache;
 } lv_fs_file_t;
 
 typedef struct {
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_gc.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_gc.h
index dac62be26..7551252a5 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_gc.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_gc.h
@@ -57,7 +57,9 @@ extern "C" {
     LV_DISPATCH_COND(f, _lv_draw_mask_radius_circle_dsc_arr_t , _lv_circle_cache, LV_DRAW_COMPLEX, 1)  \
     LV_DISPATCH_COND(f, _lv_draw_mask_saved_arr_t , _lv_draw_mask_list, LV_DRAW_COMPLEX, 1)            \
     LV_DISPATCH(f, void * , _lv_theme_default_styles)                                                  \
-    LV_DISPATCH_COND(f, uint8_t *, _lv_font_decompr_buf, LV_USE_FONT_COMPRESSED, 1)
+    LV_DISPATCH(f, void * , _lv_theme_basic_styles)                                                  \
+    LV_DISPATCH_COND(f, uint8_t *, _lv_font_decompr_buf, LV_USE_FONT_COMPRESSED, 1)                    \
+    LV_DISPATCH(f, uint8_t * , _lv_grad_cache_mem)
 
 #define LV_DEFINE_ROOT(root_type, root_name) root_type root_name;
 #define LV_ROOTS LV_ITERATE_ROOTS(LV_DEFINE_ROOT)
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_log.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_log.c
index 777849f9b..63441d6a4 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_log.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_log.c
@@ -91,7 +91,7 @@ void _lv_log_add(lv_log_level_t level, const char * file, int line, const char *
         vprintf(format, args);
         printf(" \t(in %s line #%d)\n", &file[p], line);
 #else
-        if (custom_print_cb) {
+        if(custom_print_cb) {
             char buf[512];
 #if LV_SPRINTF_CUSTOM
             char msg[256];
@@ -116,9 +116,8 @@ void lv_log(const char * buf)
 {
 #if LV_LOG_PRINTF
     puts(buf);
-#else
-    if(custom_print_cb) custom_print_cb(buf);
 #endif
+    if(custom_print_cb) custom_print_cb(buf);
 }
 
 /**********************
diff --git a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_lru.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_lru.c
similarity index 62%
rename from lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_lru.c
rename to lib/libesp32_lvgl/lvgl/src/misc/lv_lru.c
index 5e67e8a17..0dcbc4415 100644
--- a/lib/libesp32_lvgl/lvgl/src/gpu/sdl/lv_gpu_sdl_lru.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_lru.c
@@ -1,20 +1,18 @@
 /**
- * @file lv_gpu_sdl_lru.c
+ * @file lv_lru.c
  *
+ * @see https://github.com/willcannings/C-LRU-Cache
  */
 
 /*********************
  *      INCLUDES
  *********************/
 
-#include "../../lv_conf_internal.h"
-
-#if LV_USE_GPU_SDL
-#include "../../misc/lv_log.h"
-#include "lv_gpu_sdl_lru.h"
-
-#include <stdlib.h>
-#include <string.h>
+#include "lv_lru.h"
+#include "lv_math.h"
+#include "lv_mem.h"
+#include "lv_assert.h"
+#include "lv_log.h"
 
 /*********************
  *      DEFINES
@@ -24,6 +22,15 @@
  *      TYPEDEFS
  **********************/
 
+struct _lv_lru_item_t {
+    void * value;
+    void * key;
+    size_t value_length;
+    size_t key_length;
+    uint64_t access_count;
+    struct _lv_lru_item_t * next;
+};
+
 /**********************
  *  STATIC PROTOTYPES
  **********************/
@@ -36,10 +43,10 @@
 static uint32_t lv_lru_hash(lv_lru_t * cache, const void * key, uint32_t key_length);
 
 /** compare a key against an existing item's key */
-static int lv_lru_cmp_keys(lruc_item * item, const void * key, uint32_t key_length);
+static int lv_lru_cmp_keys(lv_lru_item_t * item, const void * key, uint32_t key_length);
 
 /** remove an item and push it to the free items queue */
-static void lv_lru_remove_item(lv_lru_t * cache, lruc_item * prev, lruc_item * item, uint32_t hash_index);
+static void lv_lru_remove_item(lv_lru_t * cache, lv_lru_item_t * prev, lv_lru_item_t * item, uint32_t hash_index);
 
 /**
  * remove the least recently used item
@@ -49,7 +56,7 @@ static void lv_lru_remove_item(lv_lru_t * cache, lruc_item * prev, lruc_item * i
 static void lv_lru_remove_lru_item(lv_lru_t * cache);
 
 /** pop an existing item off the free queue, or create a new one */
-static lruc_item * lv_lru_pop_or_create_item(lv_lru_t * cache);
+static lv_lru_item_t * lv_lru_pop_or_create_item(lv_lru_t * cache);
 
 /**********************
  *  STATIC VARIABLES
@@ -66,27 +73,16 @@ static lruc_item * lv_lru_pop_or_create_item(lv_lru_t * cache);
 #define test_for_missing_value()      error_for(!value || value_length == 0, LV_LRU_MISSING_VALUE)
 #define test_for_value_too_large()    error_for(value_length > cache->total_memory, LV_LRU_VALUE_TOO_LARGE)
 
-/* lock helpers */
-#define lock_cache()    if(SDL_LockMutex(cache->mutex)) {\
-        LV_LOG_WARN("LRU Cache unable to obtain mutex lock");\
-        return LV_LRU_LOCK_ERROR;\
-    }
-
-#define unlock_cache()  if(SDL_UnlockMutex(cache->mutex)) {\
-        LV_LOG_WARN("LRU Cache unable to release mutex lock");\
-        return LV_LRU_LOCK_ERROR;\
-    }
-
-
 /**********************
  *   GLOBAL FUNCTIONS
  **********************/
 
-lv_lru_t * lv_lru_new(uint64_t cache_size, uint32_t average_length, lv_lru_free_t * value_free,
-                      lv_lru_free_t * key_free)
+lv_lru_t * lv_lru_create(size_t cache_size, size_t average_length, lv_lru_free_t * value_free,
+                         lv_lru_free_t * key_free)
 {
     // create the cache
-    lv_lru_t * cache = (lv_lru_t *) calloc(sizeof(lv_lru_t), 1);
+    lv_lru_t * cache = (lv_lru_t *) lv_mem_alloc(sizeof(lv_lru_t));
+    lv_memset_00(cache, sizeof(lv_lru_t));
     if(!cache) {
         LV_LOG_WARN("LRU Cache unable to create cache object");
         return NULL;
@@ -95,93 +91,79 @@ lv_lru_t * lv_lru_new(uint64_t cache_size, uint32_t average_length, lv_lru_free_
     cache->average_item_length = average_length;
     cache->free_memory = cache_size;
     cache->total_memory = cache_size;
-    cache->seed = time(NULL);
-    cache->value_free = value_free ? value_free : free;
-    cache->key_free = key_free ? key_free : free;
+    cache->seed = lv_rand(1, UINT32_MAX);
+    cache->value_free = value_free ? value_free : lv_mem_free;
+    cache->key_free = key_free ? key_free : lv_mem_free;
 
     // size the hash table to a guestimate of the number of slots required (assuming a perfect hash)
-    cache->items = (lruc_item **) calloc(sizeof(lruc_item *), cache->hash_table_size);
+    cache->items = (lv_lru_item_t **) lv_mem_alloc(sizeof(lv_lru_item_t *) * cache->hash_table_size);
+    lv_memset_00(cache->items, sizeof(lv_lru_item_t *) * cache->hash_table_size);
     if(!cache->items) {
         LV_LOG_WARN("LRU Cache unable to create cache hash table");
-        free(cache);
-        return NULL;
-    }
-
-    // all cache calls are guarded by a mutex
-    cache->mutex = SDL_CreateMutex();
-    if(!cache->mutex) {
-        LV_LOG_WARN("LRU Cache unable to initialise mutex");
-        free(cache->items);
-        free(cache);
+        lv_mem_free(cache);
         return NULL;
     }
     return cache;
 }
 
 
-lruc_error lv_lru_free(lv_lru_t * cache)
+void lv_lru_del(lv_lru_t * cache)
 {
-    test_for_missing_cache();
+    LV_ASSERT_NULL(cache);
 
     // free each of the cached items, and the hash table
-    lruc_item * item = NULL, *next = NULL;
+    lv_lru_item_t * item = NULL, *next = NULL;
     uint32_t i = 0;
     if(cache->items) {
         for(; i < cache->hash_table_size; i++) {
             item = cache->items[i];
             while(item) {
-                next = (lruc_item *) item->next;
+                next = (lv_lru_item_t *) item->next;
                 cache->value_free(item->value);
                 cache->key_free(item->key);
                 cache->free_memory += item->value_length;
-                free(item);
+                lv_mem_free(item);
                 item = next;
             }
         }
-        free(cache->items);
+        lv_mem_free(cache->items);
     }
 
     if(cache->free_items) {
         item = cache->free_items;
         while(item) {
-            next = (lruc_item *) item->next;
-            free(item);
+            next = (lv_lru_item_t *) item->next;
+            lv_mem_free(item);
             item = next;
         }
     }
 
     // free the cache
-    if(cache->mutex) {
-        SDL_DestroyMutex(cache->mutex);
-    }
-    free(cache);
-
-    return LV_LRU_NO_ERROR;
+    lv_mem_free(cache);
 }
 
 
-lruc_error lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, void * value, size_t value_length)
+lv_lru_res_t lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, void * value, size_t value_length)
 {
     test_for_missing_cache();
     test_for_missing_key();
     test_for_missing_value();
     test_for_value_too_large();
-    lock_cache();
 
     // see if the key already exists
     uint32_t hash_index = lv_lru_hash(cache, key, key_length);
-    int64_t required = 0;
-    lruc_item * item = NULL, *prev = NULL;
+    size_t required = 0;
+    lv_lru_item_t * item = NULL, *prev = NULL;
     item = cache->items[hash_index];
 
     while(item && lv_lru_cmp_keys(item, key, key_length)) {
         prev = item;
-        item = (lruc_item *) item->next;
+        item = (lv_lru_item_t *) item->next;
     }
 
     if(item) {
         // update the value and value_lengths
-        required = (int)(value_length - item->value_length);
+        required = (size_t)(value_length - item->value_length);
         cache->value_free(item->value);
         item->value = value;
         item->value_length = value_length;
@@ -191,11 +173,11 @@ lruc_error lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, voi
         // insert a new item
         item = lv_lru_pop_or_create_item(cache);
         item->value = value;
-        item->key = malloc(key_length);
+        item->key = lv_mem_alloc(key_length);
         memcpy(item->key, key, key_length);
         item->value_length = value_length;
         item->key_length = key_length;
-        required = value_length;
+        required = (size_t) value_length;
 
         if(prev)
             prev->next = item;
@@ -205,28 +187,26 @@ lruc_error lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, voi
     item->access_count = ++cache->access_count;
 
     // remove as many items as necessary to free enough space
-    if(required > 0 && required > cache->free_memory) {
-        while(cache->free_memory < required)
+    if(required > 0 && (size_t) required > cache->free_memory) {
+        while(cache->free_memory < (size_t) required)
             lv_lru_remove_lru_item(cache);
     }
     cache->free_memory -= required;
-    unlock_cache();
-    return LV_LRU_NO_ERROR;
+    return LV_LRU_OK;
 }
 
 
-lruc_error lv_lru_get(lv_lru_t * cache, const void * key, size_t key_size, void ** value)
+lv_lru_res_t lv_lru_get(lv_lru_t * cache, const void * key, size_t key_size, void ** value)
 {
     test_for_missing_cache();
     test_for_missing_key();
-    lock_cache();
 
     // loop until we find the item, or hit the end of a chain
     uint32_t hash_index = lv_lru_hash(cache, key, key_size);
-    lruc_item * item = cache->items[hash_index];
+    lv_lru_item_t * item = cache->items[hash_index];
 
     while(item && lv_lru_cmp_keys(item, key, key_size))
-        item = (lruc_item *) item->next;
+        item = (lv_lru_item_t *) item->next;
 
     if(item) {
         *value = item->value;
@@ -236,32 +216,29 @@ lruc_error lv_lru_get(lv_lru_t * cache, const void * key, size_t key_size, void
         *value = NULL;
     }
 
-    unlock_cache();
-    return LV_LRU_NO_ERROR;
+    return LV_LRU_OK;
 }
 
-lruc_error lv_lru_delete(lv_lru_t * cache, const void * key, size_t key_size)
+lv_lru_res_t lv_lru_remove(lv_lru_t * cache, const void * key, size_t key_size)
 {
     test_for_missing_cache();
     test_for_missing_key();
-    lock_cache();
 
     // loop until we find the item, or hit the end of a chain
-    lruc_item * item = NULL, *prev = NULL;
+    lv_lru_item_t * item = NULL, *prev = NULL;
     uint32_t hash_index = lv_lru_hash(cache, key, key_size);
     item = cache->items[hash_index];
 
     while(item && lv_lru_cmp_keys(item, key, key_size)) {
         prev = item;
-        item = (lruc_item *) item->next;
+        item = (lv_lru_item_t *) item->next;
     }
 
     if(item) {
         lv_lru_remove_item(cache, prev, item, hash_index);
     }
 
-    unlock_cache();
-    return LV_LRU_NO_ERROR;
+    return LV_LRU_OK;
 }
 
 /**********************
@@ -286,16 +263,16 @@ static uint32_t lv_lru_hash(lv_lru_t * cache, const void * key, uint32_t key_len
         key_length -= 4;
     }
 
-    switch(key_length) {
-        case 3:
-            h ^= data[2] << 16;
-        case 2:
-            h ^= data[1] << 8;
-        case 1:
-            h ^= data[0];
-            h *= m;
-        break;
-    };
+    if(key_length >= 3) {
+        h ^= data[2] << 16;
+    }
+    if(key_length >= 2) {
+        h ^= data[1] << 8;
+    }
+    if(key_length >= 1) {
+        h ^= data[0];
+        h *= m;
+    }
 
     h ^= h >> 13;
     h *= m;
@@ -303,7 +280,7 @@ static uint32_t lv_lru_hash(lv_lru_t * cache, const void * key, uint32_t key_len
     return h % cache->hash_table_size;
 }
 
-static int lv_lru_cmp_keys(lruc_item * item, const void * key, uint32_t key_length)
+static int lv_lru_cmp_keys(lv_lru_item_t * item, const void * key, uint32_t key_length)
 {
     if(key_length != item->key_length)
         return 1;
@@ -311,12 +288,12 @@ static int lv_lru_cmp_keys(lruc_item * item, const void * key, uint32_t key_leng
         return memcmp(key, item->key, key_length);
 }
 
-static void lv_lru_remove_item(lv_lru_t * cache, lruc_item * prev, lruc_item * item, uint32_t hash_index)
+static void lv_lru_remove_item(lv_lru_t * cache, lv_lru_item_t * prev, lv_lru_item_t * item, uint32_t hash_index)
 {
     if(prev)
         prev->next = item->next;
     else
-        cache->items[hash_index] = (lruc_item *) item->next;
+        cache->items[hash_index] = (lv_lru_item_t *) item->next;
 
     // free memory and update the free memory counter
     cache->free_memory += item->value_length;
@@ -324,15 +301,15 @@ static void lv_lru_remove_item(lv_lru_t * cache, lruc_item * prev, lruc_item * i
     cache->key_free(item->key);
 
     // push the item to the free items queue
-    memset(item, 0, sizeof(lruc_item));
+    lv_memset_00(item, sizeof(lv_lru_item_t));
     item->next = cache->free_items;
     cache->free_items = item;
 }
 
 static void lv_lru_remove_lru_item(lv_lru_t * cache)
 {
-    lruc_item * min_item = NULL, *min_prev = NULL;
-    lruc_item * item = NULL, *prev = NULL;
+    lv_lru_item_t * min_item = NULL, *min_prev = NULL;
+    lv_lru_item_t * item = NULL, *prev = NULL;
     uint32_t i = 0, min_index = -1;
     uint64_t min_access_count = -1;
 
@@ -341,7 +318,7 @@ static void lv_lru_remove_lru_item(lv_lru_t * cache)
         prev = NULL;
 
         while(item) {
-            if(item->access_count < min_access_count || min_access_count == -1) {
+            if(item->access_count < min_access_count || (int64_t) min_access_count == -1) {
                 min_access_count = item->access_count;
                 min_item = item;
                 min_prev = prev;
@@ -356,20 +333,19 @@ static void lv_lru_remove_lru_item(lv_lru_t * cache)
         lv_lru_remove_item(cache, min_prev, min_item, min_index);
 }
 
-static lruc_item * lv_lru_pop_or_create_item(lv_lru_t * cache)
+static lv_lru_item_t * lv_lru_pop_or_create_item(lv_lru_t * cache)
 {
-    lruc_item * item = NULL;
+    lv_lru_item_t * item = NULL;
 
     if(cache->free_items) {
         item = cache->free_items;
         cache->free_items = item->next;
-        memset(item, 0, sizeof(lruc_item));
+        lv_memset_00(item, sizeof(lv_lru_item_t));
     }
     else {
-        item = (lruc_item *) calloc(sizeof(lruc_item), 1);
+        item = (lv_lru_item_t *) lv_mem_alloc(sizeof(lv_lru_item_t));
+        lv_memset_00(item, sizeof(lv_lru_item_t));
     }
 
     return item;
 }
-
-#endif /*LV_USE_GPU_SDL*/
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_lru.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_lru.h
new file mode 100644
index 000000000..07d3bd361
--- /dev/null
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_lru.h
@@ -0,0 +1,81 @@
+/**
+ * @file lv_lru.h
+ *
+ */
+
+#ifndef LV_LRU_H
+#define LV_LRU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+#include "../lv_conf_internal.h"
+
+#include "lv_types.h"
+
+#include <stdint.h>
+#include <stddef.h>
+
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef enum {
+    LV_LRU_OK = 0,
+    LV_LRU_MISSING_CACHE,
+    LV_LRU_MISSING_KEY,
+    LV_LRU_MISSING_VALUE,
+    LV_LRU_LOCK_ERROR,
+    LV_LRU_VALUE_TOO_LARGE
+} lv_lru_res_t;
+
+typedef void (lv_lru_free_t)(void * v);
+typedef struct _lv_lru_item_t lv_lru_item_t;
+
+typedef struct lv_lru_t {
+    lv_lru_item_t ** items;
+    uint64_t access_count;
+    size_t free_memory;
+    size_t total_memory;
+    size_t average_item_length;
+    size_t hash_table_size;
+    uint32_t seed;
+    lv_lru_free_t * value_free;
+    lv_lru_free_t * key_free;
+    lv_lru_item_t * free_items;
+} lv_lru_t;
+
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+lv_lru_t * lv_lru_create(size_t cache_size, size_t average_length, lv_lru_free_t * value_free,
+                         lv_lru_free_t * key_free);
+
+void lv_lru_del(lv_lru_t * cache);
+
+lv_lru_res_t lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, void * value, size_t value_length);
+
+lv_lru_res_t lv_lru_get(lv_lru_t * cache, const void * key, size_t key_size, void ** value);
+
+lv_lru_res_t lv_lru_remove(lv_lru_t * cache, const void * key, size_t key_size);
+
+/**********************
+ *      MACROS
+ **********************/
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif /*LV_LRU_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_mem.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_mem.h
index 0d1817fed..7a83b3d5d 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_mem.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_mem.h
@@ -84,7 +84,7 @@ void lv_mem_free(void * data);
  * @param data pointer to an allocated memory.
  * Its content will be copied to the new memory block and freed
  * @param new_size the desired new size in byte
- * @return pointer to the new memory
+ * @return pointer to the new memory, NULL on failure
  */
 void * lv_mem_realloc(void * data_p, size_t new_size);
 
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_misc.mk b/lib/libesp32_lvgl/lvgl/src/misc/lv_misc.mk
index 5e053f877..1dfd4eec9 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_misc.mk
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_misc.mk
@@ -8,6 +8,7 @@ CSRCS += lv_fs.c
 CSRCS += lv_gc.c
 CSRCS += lv_ll.c
 CSRCS += lv_log.c
+CSRCS += lv_lru.c
 CSRCS += lv_math.c
 CSRCS += lv_mem.c
 CSRCS += lv_printf.c
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.c
index ebe8a55c0..9077a7a11 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.c
@@ -749,7 +749,7 @@ static int _vsnprintf(out_fct_type out, char * buffer, const size_t maxlen, cons
                                              width, flags);
                         }
                     }
-                    else if (*format == 'V') {
+                    else if(*format == 'V') {
                         lv_vaformat_t * vaf = va_arg(va, lv_vaformat_t *);
                         va_list copy;
 
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.h
index 304c5b9cc..4cbbd84c0 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.h
@@ -35,19 +35,19 @@
 #define _LV_PRINTF_H_
 
 #if defined(__has_include)
-#  if __has_include(<inttypes.h>)
-#    include <inttypes.h>
-     /* platform-specific printf format for int32_t, usually "d" or "ld" */
-#    define LV_PRId32 PRId32
-#    define LV_PRIu32 PRIu32
-#  else
-#    define LV_PRId32 "d"
-#    define LV_PRIu32 "u"
-#  endif
+    #if __has_include(<inttypes.h>)
+        #include <inttypes.h>
+        /* platform-specific printf format for int32_t, usually "d" or "ld" */
+        #define LV_PRId32 PRId32
+        #define LV_PRIu32 PRIu32
+    #else
+        #define LV_PRId32 "d"
+        #define LV_PRIu32 "u"
+    #endif
 #else
-   /* hope this is correct for ports without __has_include or without inttypes.h */
-#  define LV_PRId32 "d"
-#  define LV_PRIu32 "u"
+    /* hope this is correct for ports without __has_include or without inttypes.h */
+    #define LV_PRId32 "d"
+    #define LV_PRIu32 "u"
 #endif
 
 #ifdef __cplusplus
@@ -64,8 +64,8 @@ extern "C" {
 #include "lv_types.h"
 
 typedef struct {
-  const char * fmt;
-  va_list * va;
+    const char * fmt;
+    va_list * va;
 } lv_vaformat_t;
 
 /**
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_style.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_style.c
index 160c1de53..8b065a8e6 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_style.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_style.c
@@ -65,7 +65,6 @@ void lv_style_reset(lv_style_t * style)
 #if LV_USE_ASSERT_STYLE
     style->sentinel = LV_STYLE_SENTINEL_VALUE;
 #endif
-
 }
 
 lv_style_prop_t lv_style_register_prop(void)
@@ -209,7 +208,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_
     style->has_group |= 1 << group;
 }
 
-lv_res_t lv_style_get_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
+lv_res_t lv_style_get_prop(const lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
 {
     return lv_style_get_prop_inlined(style, prop, value);
 }
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_style.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_style.h
index 9b4d012c8..6ec97cb57 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_style.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_style.h
@@ -14,6 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
+#include <stdint.h>
 #include "../font/lv_font.h"
 #include "lv_color.h"
 #include "lv_area.h"
@@ -50,6 +51,12 @@ LV_EXPORT_CONST_INT(LV_IMG_ZOOM_NONE);
 #define LV_STYLE_CONST_INIT(var_name, prop_array) const lv_style_t var_name = { .v_p = { .const_props = prop_array }, .has_group = 0xFF, .is_const = 1 }
 #endif
 
+/** On simple system, don't waste resources on gradients */
+#if !defined(LV_DRAW_COMPLEX) || !defined(LV_GRADIENT_MAX_STOPS)
+#define LV_GRADIENT_MAX_STOPS 2
+#endif
+
+
 /**********************
  *      TYPEDEFS
  **********************/
@@ -62,6 +69,7 @@ enum {
     LV_BLEND_MODE_ADDITIVE,   /**< Add the respective color channels*/
     LV_BLEND_MODE_SUBTRACTIVE,/**< Subtract the foreground from the background*/
     LV_BLEND_MODE_MULTIPLY,   /**< Multiply the foreground and background*/
+    LV_BLEND_MODE_REPLACE,    /**< Replace background with foreground in the area*/
 };
 
 typedef uint8_t lv_blend_mode_t;
@@ -104,6 +112,36 @@ enum {
 
 typedef uint8_t lv_grad_dir_t;
 
+/**
+ * The dithering algorithm for the gradient
+ * Depends on LV_DITHER_GRADIENT
+ */
+enum {
+    LV_DITHER_NONE,     /**< No dithering, colors are just quantized to the output resolution*/
+    LV_DITHER_ORDERED,  /**< Ordered dithering. Faster to compute and use less memory but lower quality*/
+    LV_DITHER_ERR_DIFF, /**< Error diffusion mode. Slower to compute and use more memory but give highest dither quality*/
+};
+
+typedef uint8_t lv_dither_mode_t;
+
+/** A gradient stop definition.
+ *  This matches a color and a position in a virtual 0-255 scale.
+ */
+typedef struct {
+    lv_color_t color;   /**< The stop color */
+    uint8_t    frac;    /**< The stop position in 1/255 unit */
+} lv_gradient_stop_t;
+
+/** A descriptor of a gradient. */
+typedef struct {
+    lv_gradient_stop_t   stops[LV_GRADIENT_MAX_STOPS]; /**< A gradient stop array */
+    uint8_t              stops_count;                  /**< The number of used stops in the array */
+    lv_grad_dir_t        dir : 3;                      /**< The gradient direction.
+                                                        * Any of LV_GRAD_DIR_HOR, LV_GRAD_DIR_VER, LV_GRAD_DIR_NONE */
+    lv_dither_mode_t     dither : 3;                   /**< Whether to dither the gradient or not.
+                                                        * Any of LV_DITHER_NONE, LV_DITHER_ORDERED, LV_DITHER_ERR_DIFF */
+} lv_grad_dsc_t;
+
 /**
  * A common type to handle all the property types in the same way.
  */
@@ -153,13 +191,16 @@ typedef enum {
     LV_STYLE_BG_GRAD_DIR             = 35,
     LV_STYLE_BG_MAIN_STOP            = 36,
     LV_STYLE_BG_GRAD_STOP            = 37,
+    LV_STYLE_BG_GRAD                 = 38,
+    LV_STYLE_BG_DITHER_MODE          = 39,
 
-    LV_STYLE_BG_IMG_SRC              = 38 | LV_STYLE_PROP_EXT_DRAW,
-    LV_STYLE_BG_IMG_OPA              = 39,
-    LV_STYLE_BG_IMG_RECOLOR          = 40,
-    LV_STYLE_BG_IMG_RECOLOR_FILTERED = 40 | LV_STYLE_PROP_FILTER,
-    LV_STYLE_BG_IMG_RECOLOR_OPA      = 41,
-    LV_STYLE_BG_IMG_TILED            = 42,
+
+    LV_STYLE_BG_IMG_SRC              = 40 | LV_STYLE_PROP_EXT_DRAW,
+    LV_STYLE_BG_IMG_OPA              = 41,
+    LV_STYLE_BG_IMG_RECOLOR          = 42,
+    LV_STYLE_BG_IMG_RECOLOR_FILTERED = 42 | LV_STYLE_PROP_FILTER,
+    LV_STYLE_BG_IMG_RECOLOR_OPA      = 43,
+    LV_STYLE_BG_IMG_TILED            = 44,
 
     /*Group 3*/
     LV_STYLE_BORDER_COLOR            = 48,
@@ -338,7 +379,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_
  *         LV_RES_OK: the property was fond, and `value` is set accordingly
  * @note For performance reasons there are no sanity check on `style`
  */
-lv_res_t lv_style_get_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value);
+lv_res_t lv_style_get_prop(const lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value);
 
 
 /**
@@ -351,7 +392,8 @@ lv_res_t lv_style_get_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_va
  * @note For performance reasons there are no sanity check on `style`
  * @note This function is the same as ::lv_style_get_prop but inlined. Use it only on performance critical places
  */
-static inline lv_res_t lv_style_get_prop_inlined(lv_style_t * style, lv_style_prop_t prop, lv_style_value_t * value)
+static inline lv_res_t lv_style_get_prop_inlined(const lv_style_t * style, lv_style_prop_t prop,
+                                                 lv_style_value_t * value)
 {
     if(style->is_const) {
         const lv_style_const_prop_t * const_prop;
@@ -411,7 +453,7 @@ lv_style_value_t lv_style_prop_get_default(lv_style_prop_t prop);
 /**
  * Checks if a style is empty (has no properties)
  * @param style pointer to a style
- * @return
+ * @return true if the style is empty
  */
 bool lv_style_is_empty(const lv_style_t * style);
 
@@ -425,6 +467,12 @@ uint8_t _lv_style_get_prop_group(lv_style_prop_t prop);
 
 #include "lv_style_gen.h"
 
+static inline void lv_style_set_size(lv_style_t * style, lv_coord_t value)
+{
+    lv_style_set_width(style, value);
+    lv_style_set_height(style, value);
+}
+
 static inline void lv_style_set_pad_all(lv_style_t * style, lv_coord_t value)
 {
     lv_style_set_pad_left(style, value);
@@ -451,12 +499,6 @@ static inline void lv_style_set_pad_gap(lv_style_t * style, lv_coord_t value)
     lv_style_set_pad_column(style, value);
 }
 
-static inline void lv_style_set_size(lv_style_t * style, lv_coord_t value)
-{
-    lv_style_set_width(style, value);
-    lv_style_set_height(style, value);
-}
-
 
 /*************************
  *    GLOBAL VARIABLES
@@ -467,10 +509,13 @@ static inline void lv_style_set_size(lv_style_t * style, lv_coord_t value)
  **********************/
 
 #if LV_USE_ASSERT_STYLE
-#  define LV_ASSERT_STYLE(style_p)    LV_ASSERT_MSG(style_p != NULL, "The style is NULL");          \
-    LV_ASSERT_MSG(style_p->sentinel == LV_STYLE_SENTINEL_VALUE, "Style is not initialized or corrupted");
+#  define LV_ASSERT_STYLE(style_p)                                                                            \
+    do {                                                                                                      \
+        LV_ASSERT_MSG(style_p != NULL, "The style is NULL");                                                  \
+        LV_ASSERT_MSG(style_p->sentinel == LV_STYLE_SENTINEL_VALUE, "Style is not initialized or corrupted"); \
+    } while(0)
 #else
-# define LV_ASSERT_STYLE(p)
+#  define LV_ASSERT_STYLE(p) do{}while(0)
 #endif
 
 #ifdef __cplusplus
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.c
index f26884e7f..b806a996b 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.c
@@ -1,5 +1,5 @@
 #include "lv_style.h"
-#include <stdbool.h>
+
 void lv_style_set_width(lv_style_t * style, lv_coord_t value)
 {
     lv_style_value_t v = {
@@ -168,94 +168,6 @@ void lv_style_set_pad_column(lv_style_t * style, lv_coord_t value)
     lv_style_set_prop(style, LV_STYLE_PAD_COLUMN, v);
 }
 
-void lv_style_set_radius(lv_style_t * style, lv_coord_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_RADIUS, v);
-}
-
-void lv_style_set_clip_corner(lv_style_t * style, bool value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_CLIP_CORNER, v);
-}
-
-void lv_style_set_opa(lv_style_t * style, lv_opa_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_OPA, v);
-}
-
-void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value)
-{
-    lv_style_value_t v = {
-        .ptr = value
-    };
-    lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_DSC, v);
-}
-
-void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_OPA, v);
-}
-
-void lv_style_set_anim_time(lv_style_t * style, uint32_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_ANIM_TIME, v);
-}
-
-void lv_style_set_anim_speed(lv_style_t * style, uint32_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_ANIM_SPEED, v);
-}
-
-void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value)
-{
-    lv_style_value_t v = {
-        .ptr = value
-    };
-    lv_style_set_prop(style, LV_STYLE_TRANSITION, v);
-}
-
-void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_BLEND_MODE, v);
-}
-
-void lv_style_set_layout(lv_style_t * style, uint16_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_LAYOUT, v);
-}
-
-void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_BASE_DIR, v);
-}
-
 void lv_style_set_bg_color(lv_style_t * style, lv_color_t value)
 {
     lv_style_value_t v = {
@@ -320,6 +232,22 @@ void lv_style_set_bg_grad_stop(lv_style_t * style, lv_coord_t value)
     lv_style_set_prop(style, LV_STYLE_BG_GRAD_STOP, v);
 }
 
+void lv_style_set_bg_grad(lv_style_t * style, const lv_grad_dsc_t * value)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_style_set_prop(style, LV_STYLE_BG_GRAD, v);
+}
+
+void lv_style_set_bg_dither_mode(lv_style_t * style, lv_dither_mode_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_BG_DITHER_MODE, v);
+}
+
 void lv_style_set_bg_img_src(lv_style_t * style, const void * value)
 {
     lv_style_value_t v = {
@@ -416,102 +344,6 @@ void lv_style_set_border_post(lv_style_t * style, bool value)
     lv_style_set_prop(style, LV_STYLE_BORDER_POST, v);
 }
 
-void lv_style_set_text_color(lv_style_t * style, lv_color_t value)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_COLOR, v);
-}
-
-void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_COLOR_FILTERED, v);
-}
-
-void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_OPA, v);
-}
-
-void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value)
-{
-    lv_style_value_t v = {
-        .ptr = value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_FONT, v);
-}
-
-void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_LETTER_SPACE, v);
-}
-
-void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_LINE_SPACE, v);
-}
-
-void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_DECOR, v);
-}
-
-void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_TEXT_ALIGN, v);
-}
-
-void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_IMG_OPA, v);
-}
-
-void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR, v);
-}
-
-void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value)
-{
-    lv_style_value_t v = {
-        .color = value
-    };
-    lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_FILTERED, v);
-}
-
-void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value)
-{
-    lv_style_value_t v = {
-        .num = (int32_t)value
-    };
-    lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_OPA, v);
-}
-
 void lv_style_set_outline_width(lv_style_t * style, lv_coord_t value)
 {
     lv_style_value_t v = {
@@ -608,6 +440,38 @@ void lv_style_set_shadow_opa(lv_style_t * style, lv_opa_t value)
     lv_style_set_prop(style, LV_STYLE_SHADOW_OPA, v);
 }
 
+void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_IMG_OPA, v);
+}
+
+void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR, v);
+}
+
+void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_FILTERED, v);
+}
+
+void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_IMG_RECOLOR_OPA, v);
+}
+
 void lv_style_set_line_width(lv_style_t * style, lv_coord_t value)
 {
     lv_style_value_t v = {
@@ -712,3 +576,154 @@ void lv_style_set_arc_img_src(lv_style_t * style, const void * value)
     lv_style_set_prop(style, LV_STYLE_ARC_IMG_SRC, v);
 }
 
+void lv_style_set_text_color(lv_style_t * style, lv_color_t value)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_COLOR, v);
+}
+
+void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value)
+{
+    lv_style_value_t v = {
+        .color = value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_COLOR_FILTERED, v);
+}
+
+void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_OPA, v);
+}
+
+void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_FONT, v);
+}
+
+void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_LETTER_SPACE, v);
+}
+
+void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_LINE_SPACE, v);
+}
+
+void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_DECOR, v);
+}
+
+void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_TEXT_ALIGN, v);
+}
+
+void lv_style_set_radius(lv_style_t * style, lv_coord_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_RADIUS, v);
+}
+
+void lv_style_set_clip_corner(lv_style_t * style, bool value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_CLIP_CORNER, v);
+}
+
+void lv_style_set_opa(lv_style_t * style, lv_opa_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_OPA, v);
+}
+
+void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_DSC, v);
+}
+
+void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_COLOR_FILTER_OPA, v);
+}
+
+void lv_style_set_anim_time(lv_style_t * style, uint32_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_ANIM_TIME, v);
+}
+
+void lv_style_set_anim_speed(lv_style_t * style, uint32_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_ANIM_SPEED, v);
+}
+
+void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value)
+{
+    lv_style_value_t v = {
+        .ptr = value
+    };
+    lv_style_set_prop(style, LV_STYLE_TRANSITION, v);
+}
+
+void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_BLEND_MODE, v);
+}
+
+void lv_style_set_layout(lv_style_t * style, uint16_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_LAYOUT, v);
+}
+
+void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value)
+{
+    lv_style_value_t v = {
+        .num = (int32_t)value
+    };
+    lv_style_set_prop(style, LV_STYLE_BASE_DIR, v);
+}
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.h
index eeb648ece..04e1f1a52 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.h
@@ -19,17 +19,6 @@ void lv_style_set_pad_left(lv_style_t * style, lv_coord_t value);
 void lv_style_set_pad_right(lv_style_t * style, lv_coord_t value);
 void lv_style_set_pad_row(lv_style_t * style, lv_coord_t value);
 void lv_style_set_pad_column(lv_style_t * style, lv_coord_t value);
-void lv_style_set_radius(lv_style_t * style, lv_coord_t value);
-void lv_style_set_clip_corner(lv_style_t * style, bool value);
-void lv_style_set_opa(lv_style_t * style, lv_opa_t value);
-void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value);
-void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value);
-void lv_style_set_anim_time(lv_style_t * style, uint32_t value);
-void lv_style_set_anim_speed(lv_style_t * style, uint32_t value);
-void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value);
-void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value);
-void lv_style_set_layout(lv_style_t * style, uint16_t value);
-void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value);
 void lv_style_set_bg_color(lv_style_t * style, lv_color_t value);
 void lv_style_set_bg_color_filtered(lv_style_t * style, lv_color_t value);
 void lv_style_set_bg_opa(lv_style_t * style, lv_opa_t value);
@@ -38,6 +27,8 @@ void lv_style_set_bg_grad_color_filtered(lv_style_t * style, lv_color_t value);
 void lv_style_set_bg_grad_dir(lv_style_t * style, lv_grad_dir_t value);
 void lv_style_set_bg_main_stop(lv_style_t * style, lv_coord_t value);
 void lv_style_set_bg_grad_stop(lv_style_t * style, lv_coord_t value);
+void lv_style_set_bg_grad(lv_style_t * style, const lv_grad_dsc_t * value);
+void lv_style_set_bg_dither_mode(lv_style_t * style, lv_dither_mode_t value);
 void lv_style_set_bg_img_src(lv_style_t * style, const void * value);
 void lv_style_set_bg_img_opa(lv_style_t * style, lv_opa_t value);
 void lv_style_set_bg_img_recolor(lv_style_t * style, lv_color_t value);
@@ -50,18 +41,6 @@ void lv_style_set_border_opa(lv_style_t * style, lv_opa_t value);
 void lv_style_set_border_width(lv_style_t * style, lv_coord_t value);
 void lv_style_set_border_side(lv_style_t * style, lv_border_side_t value);
 void lv_style_set_border_post(lv_style_t * style, bool value);
-void lv_style_set_text_color(lv_style_t * style, lv_color_t value);
-void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value);
-void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value);
-void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value);
-void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value);
-void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value);
-void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value);
-void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value);
-void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value);
-void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value);
-void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value);
-void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value);
 void lv_style_set_outline_width(lv_style_t * style, lv_coord_t value);
 void lv_style_set_outline_color(lv_style_t * style, lv_color_t value);
 void lv_style_set_outline_color_filtered(lv_style_t * style, lv_color_t value);
@@ -74,6 +53,10 @@ void lv_style_set_shadow_spread(lv_style_t * style, lv_coord_t value);
 void lv_style_set_shadow_color(lv_style_t * style, lv_color_t value);
 void lv_style_set_shadow_color_filtered(lv_style_t * style, lv_color_t value);
 void lv_style_set_shadow_opa(lv_style_t * style, lv_opa_t value);
+void lv_style_set_img_opa(lv_style_t * style, lv_opa_t value);
+void lv_style_set_img_recolor(lv_style_t * style, lv_color_t value);
+void lv_style_set_img_recolor_filtered(lv_style_t * style, lv_color_t value);
+void lv_style_set_img_recolor_opa(lv_style_t * style, lv_opa_t value);
 void lv_style_set_line_width(lv_style_t * style, lv_coord_t value);
 void lv_style_set_line_dash_width(lv_style_t * style, lv_coord_t value);
 void lv_style_set_line_dash_gap(lv_style_t * style, lv_coord_t value);
@@ -87,715 +70,477 @@ void lv_style_set_arc_color(lv_style_t * style, lv_color_t value);
 void lv_style_set_arc_color_filtered(lv_style_t * style, lv_color_t value);
 void lv_style_set_arc_opa(lv_style_t * style, lv_opa_t value);
 void lv_style_set_arc_img_src(lv_style_t * style, const void * value);
+void lv_style_set_text_color(lv_style_t * style, lv_color_t value);
+void lv_style_set_text_color_filtered(lv_style_t * style, lv_color_t value);
+void lv_style_set_text_opa(lv_style_t * style, lv_opa_t value);
+void lv_style_set_text_font(lv_style_t * style, const lv_font_t * value);
+void lv_style_set_text_letter_space(lv_style_t * style, lv_coord_t value);
+void lv_style_set_text_line_space(lv_style_t * style, lv_coord_t value);
+void lv_style_set_text_decor(lv_style_t * style, lv_text_decor_t value);
+void lv_style_set_text_align(lv_style_t * style, lv_text_align_t value);
+void lv_style_set_radius(lv_style_t * style, lv_coord_t value);
+void lv_style_set_clip_corner(lv_style_t * style, bool value);
+void lv_style_set_opa(lv_style_t * style, lv_opa_t value);
+void lv_style_set_color_filter_dsc(lv_style_t * style, const lv_color_filter_dsc_t * value);
+void lv_style_set_color_filter_opa(lv_style_t * style, lv_opa_t value);
+void lv_style_set_anim_time(lv_style_t * style, uint32_t value);
+void lv_style_set_anim_speed(lv_style_t * style, uint32_t value);
+void lv_style_set_transition(lv_style_t * style, const lv_style_transition_dsc_t * value);
+void lv_style_set_blend_mode(lv_style_t * style, lv_blend_mode_t value);
+void lv_style_set_layout(lv_style_t * style, uint16_t value);
+void lv_style_set_base_dir(lv_style_t * style, lv_base_dir_t value);
+
 #define LV_STYLE_CONST_WIDTH(val) \
     { \
-        .prop = LV_STYLE_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_MIN_WIDTH(val) \
     { \
-        .prop = LV_STYLE_MIN_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_MIN_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_MAX_WIDTH(val) \
     { \
-        .prop = LV_STYLE_MAX_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_MAX_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_HEIGHT(val) \
     { \
-        .prop = LV_STYLE_HEIGHT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_HEIGHT, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_MIN_HEIGHT(val) \
     { \
-        .prop = LV_STYLE_MIN_HEIGHT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_MIN_HEIGHT, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_MAX_HEIGHT(val) \
     { \
-        .prop = LV_STYLE_MAX_HEIGHT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_MAX_HEIGHT, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_X(val) \
     { \
-        .prop = LV_STYLE_X, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_X, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_Y(val) \
     { \
-        .prop = LV_STYLE_Y, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_Y, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_ALIGN(val) \
     { \
-        .prop = LV_STYLE_ALIGN, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_ALIGN, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_TRANSFORM_WIDTH(val) \
     { \
-        .prop = LV_STYLE_TRANSFORM_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_TRANSFORM_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_TRANSFORM_HEIGHT(val) \
     { \
-        .prop = LV_STYLE_TRANSFORM_HEIGHT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_TRANSFORM_HEIGHT, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_TRANSLATE_X(val) \
     { \
-        .prop = LV_STYLE_TRANSLATE_X, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_TRANSLATE_X, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_TRANSLATE_Y(val) \
     { \
-        .prop = LV_STYLE_TRANSLATE_Y, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_TRANSLATE_Y, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_TRANSFORM_ZOOM(val) \
     { \
-        .prop = LV_STYLE_TRANSFORM_ZOOM, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_TRANSFORM_ZOOM, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_TRANSFORM_ANGLE(val) \
     { \
-        .prop = LV_STYLE_TRANSFORM_ANGLE, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_TRANSFORM_ANGLE, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_PAD_TOP(val) \
     { \
-        .prop = LV_STYLE_PAD_TOP, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_PAD_TOP, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_PAD_BOTTOM(val) \
     { \
-        .prop = LV_STYLE_PAD_BOTTOM, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_PAD_BOTTOM, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_PAD_LEFT(val) \
     { \
-        .prop = LV_STYLE_PAD_LEFT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_PAD_LEFT, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_PAD_RIGHT(val) \
     { \
-        .prop = LV_STYLE_PAD_RIGHT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_PAD_RIGHT, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_PAD_ROW(val) \
     { \
-        .prop = LV_STYLE_PAD_ROW, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_PAD_ROW, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_PAD_COLUMN(val) \
     { \
-        .prop = LV_STYLE_PAD_COLUMN, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_RADIUS(val) \
-    { \
-        .prop = LV_STYLE_RADIUS, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_CLIP_CORNER(val) \
-    { \
-        .prop = LV_STYLE_CLIP_CORNER, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_OPA(val) \
-    { \
-        .prop = LV_STYLE_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_COLOR_FILTER_DSC(val) \
-    { \
-        .prop = LV_STYLE_COLOR_FILTER_DSC, \
-        .value = { \
-            .ptr = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_COLOR_FILTER_OPA(val) \
-    { \
-        .prop = LV_STYLE_COLOR_FILTER_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_ANIM_TIME(val) \
-    { \
-        .prop = LV_STYLE_ANIM_TIME, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_ANIM_SPEED(val) \
-    { \
-        .prop = LV_STYLE_ANIM_SPEED, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TRANSITION(val) \
-    { \
-        .prop = LV_STYLE_TRANSITION, \
-        .value = { \
-            .ptr = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_BLEND_MODE(val) \
-    { \
-        .prop = LV_STYLE_BLEND_MODE, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_LAYOUT(val) \
-    { \
-        .prop = LV_STYLE_LAYOUT, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_BASE_DIR(val) \
-    { \
-        .prop = LV_STYLE_BASE_DIR, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_PAD_COLUMN, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_COLOR(val) \
     { \
-        .prop = LV_STYLE_BG_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BG_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BG_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_BG_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BG_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BG_OPA(val) \
     { \
-        .prop = LV_STYLE_BG_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_GRAD_COLOR(val) \
     { \
-        .prop = LV_STYLE_BG_GRAD_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BG_GRAD_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BG_GRAD_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_BG_GRAD_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BG_GRAD_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BG_GRAD_DIR(val) \
     { \
-        .prop = LV_STYLE_BG_GRAD_DIR, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_GRAD_DIR, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_MAIN_STOP(val) \
     { \
-        .prop = LV_STYLE_BG_MAIN_STOP, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_MAIN_STOP, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_GRAD_STOP(val) \
     { \
-        .prop = LV_STYLE_BG_GRAD_STOP, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_GRAD_STOP, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_BG_GRAD(val) \
+    { \
+        .prop = LV_STYLE_BG_GRAD, .value = { .ptr = val } \
+    }
+
+#define LV_STYLE_CONST_BG_DITHER_MODE(val) \
+    { \
+        .prop = LV_STYLE_BG_DITHER_MODE, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_IMG_SRC(val) \
     { \
-        .prop = LV_STYLE_BG_IMG_SRC, \
-        .value = { \
-            .ptr = val \
-        } \
+        .prop = LV_STYLE_BG_IMG_SRC, .value = { .ptr = val } \
     }
 
 #define LV_STYLE_CONST_BG_IMG_OPA(val) \
     { \
-        .prop = LV_STYLE_BG_IMG_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_IMG_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_IMG_RECOLOR(val) \
     { \
-        .prop = LV_STYLE_BG_IMG_RECOLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BG_IMG_RECOLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BG_IMG_RECOLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_BG_IMG_RECOLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BG_IMG_RECOLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BG_IMG_RECOLOR_OPA(val) \
     { \
-        .prop = LV_STYLE_BG_IMG_RECOLOR_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_IMG_RECOLOR_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BG_IMG_TILED(val) \
     { \
-        .prop = LV_STYLE_BG_IMG_TILED, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BG_IMG_TILED, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BORDER_COLOR(val) \
     { \
-        .prop = LV_STYLE_BORDER_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BORDER_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BORDER_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_BORDER_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_BORDER_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_BORDER_OPA(val) \
     { \
-        .prop = LV_STYLE_BORDER_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BORDER_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BORDER_WIDTH(val) \
     { \
-        .prop = LV_STYLE_BORDER_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BORDER_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BORDER_SIDE(val) \
     { \
-        .prop = LV_STYLE_BORDER_SIDE, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BORDER_SIDE, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_BORDER_POST(val) \
     { \
-        .prop = LV_STYLE_BORDER_POST, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_COLOR(val) \
-    { \
-        .prop = LV_STYLE_TEXT_COLOR, \
-        .value = { \
-            .color = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_COLOR_FILTERED(val) \
-    { \
-        .prop = LV_STYLE_TEXT_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_OPA(val) \
-    { \
-        .prop = LV_STYLE_TEXT_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_FONT(val) \
-    { \
-        .prop = LV_STYLE_TEXT_FONT, \
-        .value = { \
-            .ptr = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_LETTER_SPACE(val) \
-    { \
-        .prop = LV_STYLE_TEXT_LETTER_SPACE, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_LINE_SPACE(val) \
-    { \
-        .prop = LV_STYLE_TEXT_LINE_SPACE, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_DECOR(val) \
-    { \
-        .prop = LV_STYLE_TEXT_DECOR, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_TEXT_ALIGN(val) \
-    { \
-        .prop = LV_STYLE_TEXT_ALIGN, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_IMG_OPA(val) \
-    { \
-        .prop = LV_STYLE_IMG_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
-    }
-
-#define LV_STYLE_CONST_IMG_RECOLOR(val) \
-    { \
-        .prop = LV_STYLE_IMG_RECOLOR, \
-        .value = { \
-            .color = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_IMG_RECOLOR_FILTERED(val) \
-    { \
-        .prop = LV_STYLE_IMG_RECOLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
-    }
-
-#define LV_STYLE_CONST_IMG_RECOLOR_OPA(val) \
-    { \
-        .prop = LV_STYLE_IMG_RECOLOR_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_BORDER_POST, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_OUTLINE_WIDTH(val) \
     { \
-        .prop = LV_STYLE_OUTLINE_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_OUTLINE_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_OUTLINE_COLOR(val) \
     { \
-        .prop = LV_STYLE_OUTLINE_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_OUTLINE_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_OUTLINE_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_OUTLINE_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_OUTLINE_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_OUTLINE_OPA(val) \
     { \
-        .prop = LV_STYLE_OUTLINE_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_OUTLINE_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_OUTLINE_PAD(val) \
     { \
-        .prop = LV_STYLE_OUTLINE_PAD, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_OUTLINE_PAD, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_WIDTH(val) \
     { \
-        .prop = LV_STYLE_SHADOW_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_SHADOW_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_OFS_X(val) \
     { \
-        .prop = LV_STYLE_SHADOW_OFS_X, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_SHADOW_OFS_X, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_OFS_Y(val) \
     { \
-        .prop = LV_STYLE_SHADOW_OFS_Y, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_SHADOW_OFS_Y, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_SPREAD(val) \
     { \
-        .prop = LV_STYLE_SHADOW_SPREAD, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_SHADOW_SPREAD, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_COLOR(val) \
     { \
-        .prop = LV_STYLE_SHADOW_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_SHADOW_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_SHADOW_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_SHADOW_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_SHADOW_OPA(val) \
     { \
-        .prop = LV_STYLE_SHADOW_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_SHADOW_OPA, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_IMG_OPA(val) \
+    { \
+        .prop = LV_STYLE_IMG_OPA, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_IMG_RECOLOR(val) \
+    { \
+        .prop = LV_STYLE_IMG_RECOLOR, .value = { .color = val } \
+    }
+
+#define LV_STYLE_CONST_IMG_RECOLOR_FILTERED(val) \
+    { \
+        .prop = LV_STYLE_IMG_RECOLOR_FILTERED, .value = { .color = val } \
+    }
+
+#define LV_STYLE_CONST_IMG_RECOLOR_OPA(val) \
+    { \
+        .prop = LV_STYLE_IMG_RECOLOR_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_LINE_WIDTH(val) \
     { \
-        .prop = LV_STYLE_LINE_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_LINE_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_LINE_DASH_WIDTH(val) \
     { \
-        .prop = LV_STYLE_LINE_DASH_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_LINE_DASH_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_LINE_DASH_GAP(val) \
     { \
-        .prop = LV_STYLE_LINE_DASH_GAP, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_LINE_DASH_GAP, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_LINE_ROUNDED(val) \
     { \
-        .prop = LV_STYLE_LINE_ROUNDED, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_LINE_ROUNDED, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_LINE_COLOR(val) \
     { \
-        .prop = LV_STYLE_LINE_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_LINE_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_LINE_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_LINE_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_LINE_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_LINE_OPA(val) \
     { \
-        .prop = LV_STYLE_LINE_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_LINE_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_ARC_WIDTH(val) \
     { \
-        .prop = LV_STYLE_ARC_WIDTH, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_ARC_WIDTH, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_ARC_ROUNDED(val) \
     { \
-        .prop = LV_STYLE_ARC_ROUNDED, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_ARC_ROUNDED, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_ARC_COLOR(val) \
     { \
-        .prop = LV_STYLE_ARC_COLOR, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_ARC_COLOR, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_ARC_COLOR_FILTERED(val) \
     { \
-        .prop = LV_STYLE_ARC_COLOR_FILTERED, \
-        .value = { \
-            .color = val \
-        } \
+        .prop = LV_STYLE_ARC_COLOR_FILTERED, .value = { .color = val } \
     }
 
 #define LV_STYLE_CONST_ARC_OPA(val) \
     { \
-        .prop = LV_STYLE_ARC_OPA, \
-        .value = { \
-            .num = (int32_t)val \
-        } \
+        .prop = LV_STYLE_ARC_OPA, .value = { .num = (int32_t)val } \
     }
 
 #define LV_STYLE_CONST_ARC_IMG_SRC(val) \
     { \
-        .prop = LV_STYLE_ARC_IMG_SRC, \
-        .value = { \
-            .ptr = val \
-        } \
+        .prop = LV_STYLE_ARC_IMG_SRC, .value = { .ptr = val } \
     }
 
+#define LV_STYLE_CONST_TEXT_COLOR(val) \
+    { \
+        .prop = LV_STYLE_TEXT_COLOR, .value = { .color = val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_COLOR_FILTERED(val) \
+    { \
+        .prop = LV_STYLE_TEXT_COLOR_FILTERED, .value = { .color = val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_OPA(val) \
+    { \
+        .prop = LV_STYLE_TEXT_OPA, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_FONT(val) \
+    { \
+        .prop = LV_STYLE_TEXT_FONT, .value = { .ptr = val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_LETTER_SPACE(val) \
+    { \
+        .prop = LV_STYLE_TEXT_LETTER_SPACE, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_LINE_SPACE(val) \
+    { \
+        .prop = LV_STYLE_TEXT_LINE_SPACE, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_DECOR(val) \
+    { \
+        .prop = LV_STYLE_TEXT_DECOR, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_TEXT_ALIGN(val) \
+    { \
+        .prop = LV_STYLE_TEXT_ALIGN, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_RADIUS(val) \
+    { \
+        .prop = LV_STYLE_RADIUS, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_CLIP_CORNER(val) \
+    { \
+        .prop = LV_STYLE_CLIP_CORNER, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_OPA(val) \
+    { \
+        .prop = LV_STYLE_OPA, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_COLOR_FILTER_DSC(val) \
+    { \
+        .prop = LV_STYLE_COLOR_FILTER_DSC, .value = { .ptr = val } \
+    }
+
+#define LV_STYLE_CONST_COLOR_FILTER_OPA(val) \
+    { \
+        .prop = LV_STYLE_COLOR_FILTER_OPA, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_ANIM_TIME(val) \
+    { \
+        .prop = LV_STYLE_ANIM_TIME, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_ANIM_SPEED(val) \
+    { \
+        .prop = LV_STYLE_ANIM_SPEED, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_TRANSITION(val) \
+    { \
+        .prop = LV_STYLE_TRANSITION, .value = { .ptr = val } \
+    }
+
+#define LV_STYLE_CONST_BLEND_MODE(val) \
+    { \
+        .prop = LV_STYLE_BLEND_MODE, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_LAYOUT(val) \
+    { \
+        .prop = LV_STYLE_LAYOUT, .value = { .num = (int32_t)val } \
+    }
+
+#define LV_STYLE_CONST_BASE_DIR(val) \
+    { \
+        .prop = LV_STYLE_BASE_DIR, .value = { .num = (int32_t)val } \
+    }
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.c
index 63d1842d6..64197f977 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.c
@@ -1157,7 +1157,7 @@ void * lv_tlsf_memalign(lv_tlsf_t tlsf, size_t align, size_t size)
     return block_prepare_used(control, block, adjust);
 }
 
-void lv_tlsf_free(lv_tlsf_t tlsf, void * ptr)
+void lv_tlsf_free(lv_tlsf_t tlsf, const void * ptr)
 {
     /* Don't attempt to free a NULL pointer. */
     if(ptr) {
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.h
index 77424ab83..9380ee8ca 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.h
@@ -66,7 +66,7 @@ void lv_tlsf_remove_pool(lv_tlsf_t tlsf, lv_pool_t pool);
 void * lv_tlsf_malloc(lv_tlsf_t tlsf, size_t bytes);
 void * lv_tlsf_memalign(lv_tlsf_t tlsf, size_t align, size_t bytes);
 void * lv_tlsf_realloc(lv_tlsf_t tlsf, void * ptr, size_t size);
-void lv_tlsf_free(lv_tlsf_t tlsf, void * ptr);
+void lv_tlsf_free(lv_tlsf_t tlsf, const void * ptr);
 
 /* Returns internal block size, not original request size */
 size_t lv_tlsf_block_size(void * ptr);
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.c
index b8c31e5b7..3879b48d9 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.c
@@ -1,5 +1,5 @@
 /**
- * @file lv_text.c
+ * @file lv_txt.c
  *
  */
 
@@ -105,7 +105,7 @@ void lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t *
 
     /*Calc. the height and longest line*/
     while(text[line_start] != '\0') {
-        new_line_start += _lv_txt_get_next_line(&text[line_start], font, letter_space, max_width, flag);
+        new_line_start += _lv_txt_get_next_line(&text[line_start], font, letter_space, max_width, NULL, flag);
 
         if((unsigned long)size_res->y + (unsigned long)letter_height + (unsigned long)line_space > LV_MAX_OF(lv_coord_t)) {
             LV_LOG_WARN("lv_txt_get_size: integer overflow while calculating text height");
@@ -276,12 +276,17 @@ static uint32_t lv_txt_get_next_word(const char * txt, const lv_font_t * font,
 }
 
 uint32_t _lv_txt_get_next_line(const char * txt, const lv_font_t * font,
-                               lv_coord_t letter_space, lv_coord_t max_width, lv_text_flag_t flag)
+                               lv_coord_t letter_space, lv_coord_t max_width,
+                               lv_coord_t * used_width, lv_text_flag_t flag)
 {
+    if(used_width) *used_width = 0;
+
     if(txt == NULL) return 0;
     if(txt[0] == '\0') return 0;
     if(font == NULL) return 0;
 
+    lv_coord_t line_w = 0;
+
     /*If max_width doesn't mater simply find the new line character
      *without thinking about word wrapping*/
     if((flag & LV_TEXT_FLAG_EXPAND) || (flag & LV_TEXT_FLAG_FIT)) {
@@ -290,6 +295,7 @@ uint32_t _lv_txt_get_next_line(const char * txt, const lv_font_t * font,
             /*Just find the new line chars or string ends by incrementing `i`*/
         }
         if(txt[i] != '\0') i++;    /*To go beyond `\n`*/
+        if(used_width) *used_width = -1;
         return i;
     }
 
@@ -301,9 +307,9 @@ uint32_t _lv_txt_get_next_line(const char * txt, const lv_font_t * font,
         uint32_t word_w = 0;
         uint32_t advance = lv_txt_get_next_word(&txt[i], font, letter_space, max_width, flag, &word_w, &cmd_state, i == 0);
         max_width -= word_w;
+        line_w += word_w;
 
         if(advance == 0) {
-            if(i == 0) _lv_txt_encoded_next(txt, &i); // prevent inf loops
             break;
         }
 
@@ -320,7 +326,14 @@ uint32_t _lv_txt_get_next_line(const char * txt, const lv_font_t * font,
 
     /*Always step at least one to avoid infinite loops*/
     if(i == 0) {
-        _lv_txt_encoded_next(txt, &i);
+        uint32_t letter = _lv_txt_encoded_next(txt, &i);
+        if(used_width != NULL) {
+            line_w = lv_font_get_glyph_width(font, letter, '\0');
+        }
+    }
+
+    if(used_width != NULL) {
+        *used_width = line_w;
     }
 
     return i;
@@ -733,7 +746,7 @@ static uint32_t lv_txt_utf8_get_length(const char * txt)
 
 #elif LV_TXT_ENC == LV_TXT_ENC_ASCII
 /*******************************
- *  ASCII ENCODER/DECOER
+ *  ASCII ENCODER/DECODER
  ******************************/
 
 /**
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.h
index 4d3b8453a..4f134ab6d 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.h
@@ -1,5 +1,5 @@
 /**
- * @file lv_text.h
+ * @file lv_txt.h
  *
  */
 
@@ -90,12 +90,14 @@ void lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t *
  * @param letter_space letter space
  * @param max_width max with of the text (break the lines to fit this size) Set CORD_MAX to avoid
  * line breaks
+ * @param used_width When used_width != NULL, save the width of this line if
+ * flag == LV_TEXT_FLAG_NONE, otherwise save -1.
  * @param flags settings for the text from 'txt_flag_type' enum
  * @return the index of the first char of the new line (in byte index not letter index. With UTF-8
  * they are different)
  */
-uint32_t _lv_txt_get_next_line(const char * txt, const lv_font_t * font, lv_coord_t letter_space, lv_coord_t max_width,
-                               lv_text_flag_t flag);
+uint32_t _lv_txt_get_next_line(const char * txt, const lv_font_t * font, lv_coord_t letter_space,
+                               lv_coord_t max_width, lv_coord_t * used_width, lv_text_flag_t flag);
 
 /**
  * Give the length of a text with a given font
@@ -259,4 +261,4 @@ extern uint32_t (*_lv_txt_get_encoded_length)(const char *);
 } /*extern "C"*/
 #endif
 
-#endif /*USE_TXT*/
+#endif /*LV_TXT_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_types.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_types.h
index 172f21c43..9f8ef4ca6 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_types.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_types.h
@@ -88,7 +88,7 @@ typedef uint32_t lv_uintptr_t;
 #endif
 
 #ifdef __cplusplus
-} /*extern "C"*/ 
+} /*extern "C"*/
 #endif
 
 #endif /*LV_TYPES_H*/
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.c
index f097ad937..e17a231de 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.c
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.c
@@ -37,7 +37,7 @@
 /** Searches base[0] to base[n - 1] for an item that matches *key.
  *
  * @note The function cmp must return negative if its first
- *  argument (the search key) is less that its second (a table entry),
+ *  argument (the search key) is less than its second (a table entry),
  *  zero if equal, and positive if greater.
  *
  *  @note Items in the array must be in ascending order.
@@ -46,7 +46,7 @@
  * @param base   Pointer to first element to search
  * @param n      Number of elements
  * @param size   Size of each element
- * @param cmp    Pointer to comparison function (see #lv_font_codeCompare as a comparison function
+ * @param cmp    Pointer to comparison function (see #unicode_list_compare as a comparison function
  * example)
  *
  * @return a pointer to a matching item, or NULL if none exists.
diff --git a/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.h
index 5d17d7698..84d2bb95b 100644
--- a/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.h
+++ b/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.h
@@ -39,7 +39,7 @@ extern "C" {
  * @param base   Pointer to first element to search
  * @param n      Number of elements
  * @param size   Size of each element
- * @param cmp    Pointer to comparison function (see #lv_font_codeCompare as a comparison function
+ * @param cmp    Pointer to comparison function (see #unicode_list_compare as a comparison function
  * example)
  *
  * @return a pointer to a matching item, or NULL if none exists.
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.c
index 08cfe03f5..99ffb1f15 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.c
@@ -34,6 +34,7 @@ static void lv_arc_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_arc_draw(lv_event_t * e);
 static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e);
 static void inv_arc_area(lv_obj_t * arc, uint16_t start_angle, uint16_t end_angle, lv_part_t part);
+static void inv_knob_area(lv_obj_t * obj);
 static void get_center(lv_obj_t * obj, lv_point_t * center, lv_coord_t * arc_r);
 static void get_knob_area(lv_obj_t * arc, const lv_point_t * center, lv_coord_t r, lv_area_t * knob_area);
 static void value_update(lv_obj_t * arc);
@@ -84,8 +85,8 @@ void lv_arc_set_start_angle(lv_obj_t * obj, uint16_t start)
 
     if(start > 360) start -= 360;
 
-    int16_t old_delta =  arc->indic_angle_end - arc->indic_angle_start;
-    int16_t new_delta =  arc->indic_angle_end - start;
+    int16_t old_delta = arc->indic_angle_end - arc->indic_angle_start;
+    int16_t new_delta = arc->indic_angle_end - start;
 
     if(old_delta < 0) old_delta = 360 + old_delta;
     if(new_delta < 0) new_delta = 360 + new_delta;
@@ -94,7 +95,11 @@ void lv_arc_set_start_angle(lv_obj_t * obj, uint16_t start)
     else if(new_delta < old_delta) inv_arc_area(obj, arc->indic_angle_start, start, LV_PART_INDICATOR);
     else if(old_delta < new_delta) inv_arc_area(obj, start, arc->indic_angle_start, LV_PART_INDICATOR);
 
+    inv_knob_area(obj);
+
     arc->indic_angle_start = start;
+
+    inv_knob_area(obj);
 }
 
 void lv_arc_set_end_angle(lv_obj_t * obj, uint16_t end)
@@ -103,8 +108,8 @@ void lv_arc_set_end_angle(lv_obj_t * obj, uint16_t end)
     lv_arc_t * arc = (lv_arc_t *)obj;
     if(end > 360) end -= 360;
 
-    int16_t old_delta =  arc->indic_angle_end - arc->indic_angle_start;
-    int16_t new_delta =  end - arc->indic_angle_start;
+    int16_t old_delta = arc->indic_angle_end - arc->indic_angle_start;
+    int16_t new_delta = end - arc->indic_angle_start;
 
     if(old_delta < 0) old_delta = 360 + old_delta;
     if(new_delta < 0) new_delta = 360 + new_delta;
@@ -113,7 +118,11 @@ void lv_arc_set_end_angle(lv_obj_t * obj, uint16_t end)
     else if(new_delta < old_delta) inv_arc_area(obj, end, arc->indic_angle_end, LV_PART_INDICATOR);
     else if(old_delta < new_delta) inv_arc_area(obj, arc->indic_angle_end, end, LV_PART_INDICATOR);
 
+    inv_knob_area(obj);
+
     arc->indic_angle_end = end;
+
+    inv_knob_area(obj);
 }
 
 void lv_arc_set_angles(lv_obj_t * obj, uint16_t start, uint16_t end)
@@ -129,8 +138,8 @@ void lv_arc_set_bg_start_angle(lv_obj_t * obj, uint16_t start)
 
     if(start > 360) start -= 360;
 
-    int16_t old_delta =  arc->bg_angle_end - arc->bg_angle_start;
-    int16_t new_delta =  arc->bg_angle_end - start;
+    int16_t old_delta = arc->bg_angle_end - arc->bg_angle_start;
+    int16_t new_delta = arc->bg_angle_end - start;
 
     if(old_delta < 0) old_delta = 360 + old_delta;
     if(new_delta < 0) new_delta = 360 + new_delta;
@@ -151,8 +160,8 @@ void lv_arc_set_bg_end_angle(lv_obj_t * obj, uint16_t end)
 
     if(end > 360) end -= 360;
 
-    int16_t old_delta =  arc->bg_angle_end - arc->bg_angle_start;
-    int16_t new_delta =  end - arc->bg_angle_start;
+    int16_t old_delta = arc->bg_angle_end - arc->bg_angle_start;
+    int16_t new_delta = end - arc->bg_angle_start;
 
     if(old_delta < 0) old_delta = 360 + old_delta;
     if(new_delta < 0) new_delta = 360 + new_delta;
@@ -372,19 +381,20 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e)
         lv_coord_t r;
         get_center(obj, &center, &r);
 
-        p.x -=  center.x;
-        p.y -=  center.y;
+        p.x -= center.x;
+        p.y -= center.y;
 
         /*Enter dragging mode if pressed out of the knob*/
         if(arc->dragging == false) {
             lv_coord_t indic_width = lv_obj_get_style_arc_width(obj, LV_PART_INDICATOR);
-            r -=  indic_width;
+            r -= indic_width;
             /*Add some more sensitive area if there is no advanced git testing.
              * (Advanced hit testing is more precise)*/
             if(lv_obj_has_flag(obj, LV_OBJ_FLAG_ADV_HITTEST)) {
                 r -= indic_width;
 
-            } else {
+            }
+            else {
                 r -= LV_MAX(r / 4, indic_width);
             }
             if(r < 1) r = 1;
@@ -515,7 +525,7 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e)
         lv_area_set(&a, p.x - r, p.y - r, p.x + r, p.y + r);
         if(_lv_area_is_point_on(&a, info->point, LV_RADIUS_CIRCLE)) {
             info->res = false;
-             return;
+            return;
         }
 
         /*Valid if no clicked outside*/
@@ -548,14 +558,14 @@ static void lv_arc_draw(lv_event_t * e)
     lv_obj_t * obj = lv_event_get_target(e);
     lv_arc_t * arc = (lv_arc_t *)obj;
 
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
     lv_point_t center;
     lv_coord_t arc_r;
     get_center(obj, &center, &arc_r);
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
 
     /*Draw the background arc*/
     lv_draw_arc_dsc_t arc_dsc;
@@ -571,14 +581,13 @@ static void lv_arc_draw(lv_event_t * e)
         part_draw_dsc.arc_dsc = &arc_dsc;
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
-        lv_draw_arc(center.x, center.y, part_draw_dsc.radius, arc->bg_angle_start + arc->rotation,
-                    arc->bg_angle_end + arc->rotation, clip_area,
-                    &arc_dsc);
+        lv_draw_arc(draw_ctx, &arc_dsc, &center, part_draw_dsc.radius, arc->bg_angle_start + arc->rotation,
+                    arc->bg_angle_end + arc->rotation);
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
 
-    /*make the indicator arc smaller or larger according to its greatest padding value*/
+    /*Make the indicator arc smaller or larger according to its greatest padding value*/
     lv_coord_t left_indic = lv_obj_get_style_pad_left(obj, LV_PART_INDICATOR);
     lv_coord_t right_indic = lv_obj_get_style_pad_right(obj, LV_PART_INDICATOR);
     lv_coord_t top_indic = lv_obj_get_style_pad_top(obj, LV_PART_INDICATOR);
@@ -598,9 +607,8 @@ static void lv_arc_draw(lv_event_t * e)
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
         if(arc_dsc.width > part_draw_dsc.radius) arc_dsc.width = part_draw_dsc.radius;
-        lv_draw_arc(center.x, center.y, part_draw_dsc.radius, arc->indic_angle_start + arc->rotation,
-                    arc->indic_angle_end + arc->rotation, clip_area,
-                    &arc_dsc);
+        lv_draw_arc(draw_ctx, &arc_dsc, &center, part_draw_dsc.radius, arc->indic_angle_start + arc->rotation,
+                    arc->indic_angle_end + arc->rotation);
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
@@ -619,7 +627,7 @@ static void lv_arc_draw(lv_event_t * e)
     part_draw_dsc.rect_dsc = &knob_rect_dsc;
     lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
-    lv_draw_rect(&knob_area, clip_area, &knob_rect_dsc);
+    lv_draw_rect(draw_ctx, &knob_rect_dsc, &knob_area);
 
     lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
 }
@@ -627,6 +635,10 @@ static void lv_arc_draw(lv_event_t * e)
 static void inv_arc_area(lv_obj_t * obj, uint16_t start_angle, uint16_t end_angle, lv_part_t part)
 {
     LV_ASSERT_OBJ(obj, MY_CLASS);
+
+    /*Skip this complicated invalidation if the arc is not visible*/
+    if(lv_obj_is_visible(obj) == false) return;
+
     lv_arc_t * arc = (lv_arc_t *)obj;
 
     if(start_angle == end_angle) return;
@@ -634,44 +646,35 @@ static void inv_arc_area(lv_obj_t * obj, uint16_t start_angle, uint16_t end_angl
     if(start_angle > 360) start_angle -= 360;
     if(end_angle > 360) end_angle -= 360;
 
-    /*Skip this complicated invalidation if the arc is not visible*/
-    if(lv_obj_is_visible(obj) == false) return;
-
-    lv_coord_t left = lv_obj_get_style_pad_left(obj, LV_PART_MAIN);
-    lv_coord_t right = lv_obj_get_style_pad_right(obj, LV_PART_MAIN);
-    lv_coord_t top = lv_obj_get_style_pad_top(obj, LV_PART_MAIN);
-    lv_coord_t bottom = lv_obj_get_style_pad_bottom(obj, LV_PART_MAIN);
-    lv_coord_t rout       = (LV_MIN(lv_obj_get_width(obj) - left - right, lv_obj_get_height(obj) - top - bottom)) / 2;
-    lv_coord_t x       = obj->coords.x1 + rout + left;
-    lv_coord_t y       = obj->coords.y1 + rout + top;
-    lv_coord_t w = lv_obj_get_style_arc_width(obj, part);
-    lv_coord_t rounded = lv_obj_get_style_arc_rounded(obj, part);
-
-    if(part == LV_PART_INDICATOR) {
-        lv_coord_t knob_extra_size = lv_obj_calculate_ext_draw_size(obj, LV_PART_KNOB);
-
-        lv_coord_t knob_left = lv_obj_get_style_pad_left(obj, LV_PART_KNOB);
-        lv_coord_t knob_right = lv_obj_get_style_pad_right(obj, LV_PART_KNOB);
-        lv_coord_t knob_top = lv_obj_get_style_pad_top(obj, LV_PART_KNOB);
-        lv_coord_t knob_bottom = lv_obj_get_style_pad_bottom(obj, LV_PART_KNOB);
-
-        knob_extra_size += LV_MAX4(knob_left, knob_right, knob_top, knob_bottom);
-
-        w += knob_extra_size * 2 + 2;
-        rout += knob_extra_size + 2;
-    }
-
     start_angle += arc->rotation;
     end_angle += arc->rotation;
 
     if(start_angle > 360) start_angle -= 360;
     if(end_angle > 360) end_angle -= 360;
 
+    lv_coord_t r;
+    lv_point_t c;
+    get_center(obj, &c, &r);
+
+    lv_coord_t w = lv_obj_get_style_arc_width(obj, part);
+    lv_coord_t rounded = lv_obj_get_style_arc_rounded(obj, part);
+
     lv_area_t inv_area;
-    lv_draw_arc_get_area(x, y, rout, start_angle, end_angle, w, rounded, &inv_area);
+    lv_draw_arc_get_area(c.x, c.y, r, start_angle, end_angle, w, rounded, &inv_area);
     lv_obj_invalidate_area(obj, &inv_area);
 }
 
+static void inv_knob_area(lv_obj_t * obj)
+{
+    lv_point_t c;
+    lv_coord_t r;
+    get_center(obj, &c, &r);
+
+    lv_area_t a;
+    get_knob_area(obj, &c, r, &a);
+    lv_obj_invalidate_area(obj, &a);
+}
+
 static void get_center(lv_obj_t * obj, lv_point_t * center, lv_coord_t * arc_r)
 {
     lv_coord_t left_bg = lv_obj_get_style_pad_left(obj, LV_PART_MAIN);
@@ -682,12 +685,10 @@ static void get_center(lv_obj_t * obj, lv_point_t * center, lv_coord_t * arc_r)
     lv_coord_t r = (LV_MIN(lv_obj_get_width(obj) - left_bg - right_bg,
                            lv_obj_get_height(obj) - top_bg - bottom_bg)) / 2;
 
-    *arc_r = r;
     center->x = obj->coords.x1 + r + left_bg;
     center->y = obj->coords.y1 + r + top_bg;
 
-    lv_coord_t indic_width = lv_obj_get_style_arc_width(obj, LV_PART_INDICATOR);
-    r -= indic_width;
+    if(arc_r) *arc_r = r;
 }
 
 static void get_knob_area(lv_obj_t * obj, const lv_point_t * center, lv_coord_t r, lv_area_t * knob_area)
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.h
index db9b786a1..8ec39a4aa 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.h
@@ -70,7 +70,7 @@ typedef enum {
 
 /**
  * Create an arc object
- * @param par pointer to an object, it will be the parent of the new arc
+ * @param parent pointer to an object, it will be the parent of the new arc
  * @return pointer to the created arc
  */
 lv_obj_t * lv_arc_create(lv_obj_t * parent);
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.c
index 5037f4288..0da2a9875 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.c
@@ -107,6 +107,10 @@ void lv_bar_set_start_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim
 
     lv_bar_t * bar = (lv_bar_t *)obj;
 
+    if(bar->mode != LV_BAR_MODE_RANGE) {
+        return;
+    }
+
     value = LV_CLAMP(bar->min_value, value, bar->max_value);
     value = value > bar->cur_value ? bar->cur_value : value; /*Can't be greater than the right value*/
 
@@ -130,11 +134,11 @@ void lv_bar_set_range(lv_obj_t * obj, int32_t min, int32_t max)
 
     if(bar->cur_value > max) {
         bar->cur_value = max;
-        lv_bar_set_value(obj, bar->cur_value, false);
+        lv_bar_set_value(obj, bar->cur_value, LV_ANIM_OFF);
     }
     if(bar->cur_value < min) {
         bar->cur_value = min;
-        lv_bar_set_value(obj, bar->cur_value, false);
+        lv_bar_set_value(obj, bar->cur_value, LV_ANIM_OFF);
     }
     lv_obj_invalidate(obj);
 }
@@ -211,7 +215,11 @@ static void lv_bar_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
     bar->max_value = 100;
     bar->start_value = 0;
     bar->cur_value = 0;
-    bar->mode         = LV_BAR_MODE_NORMAL;
+    bar->indic_area.x1 = 0;
+    bar->indic_area.x2 = 0;
+    bar->indic_area.y1 = 0;
+    bar->indic_area.y2 = 0;
+    bar->mode = LV_BAR_MODE_NORMAL;
 
     lv_bar_init_anim(obj, &bar->cur_value_anim);
     lv_bar_init_anim(obj, &bar->start_value_anim);
@@ -237,7 +245,7 @@ static void draw_indic(lv_event_t * e)
     lv_obj_t * obj = lv_event_get_target(e);
     lv_bar_t * bar = (lv_bar_t *)obj;
 
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
     lv_area_t bar_coords;
     lv_obj_get_coords(obj, &bar_coords);
@@ -381,7 +389,7 @@ static void draw_indic(lv_event_t * e)
     if(!sym && indic_length_calc(&bar->indic_area) <= 1) {
 
         lv_obj_draw_part_dsc_t part_draw_dsc;
-        lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+        lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
         part_draw_dsc.part = LV_PART_INDICATOR;
         part_draw_dsc.class_p = MY_CLASS;
         part_draw_dsc.type = LV_BAR_DRAW_PART_INDICATOR;
@@ -392,10 +400,6 @@ static void draw_indic(lv_event_t * e)
         return;
     }
 
-    lv_coord_t bg_radius = lv_obj_get_style_radius(obj, LV_PART_MAIN);
-    lv_coord_t short_side = LV_MIN(barw, barh);
-    if(bg_radius > short_side >> 1) bg_radius = short_side >> 1;
-
     lv_area_t indic_area;
     lv_area_copy(&indic_area, &bar->indic_area);
 
@@ -404,7 +408,7 @@ static void draw_indic(lv_event_t * e)
     lv_obj_init_draw_rect_dsc(obj, LV_PART_INDICATOR, &draw_rect_dsc);
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.part = LV_PART_INDICATOR;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_BAR_DRAW_PART_INDICATOR;
@@ -413,11 +417,19 @@ static void draw_indic(lv_event_t * e)
 
     lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
-    /*Draw only the shadow if the indicator is long enough.
+    lv_coord_t bg_radius = lv_obj_get_style_radius(obj, LV_PART_MAIN);
+    lv_coord_t short_side = LV_MIN(barw, barh);
+    if(bg_radius > short_side >> 1) bg_radius = short_side >> 1;
+
+    lv_coord_t indic_radius = draw_rect_dsc.radius;
+    short_side = LV_MIN(indicw, indich);
+    if(indic_radius > short_side >> 1) indic_radius = short_side >> 1;
+
+    /*Draw only the shadow and outline only if the indicator is long enough.
      *The radius of the bg and the indicator can make a strange shape where
      *it'd be very difficult to draw shadow.*/
-    if((hor && lv_area_get_width(&bar->indic_area) > bg_radius * 2) ||
-       (!hor && lv_area_get_height(&bar->indic_area) > bg_radius * 2)) {
+    if((hor && lv_area_get_width(&bar->indic_area) > indic_radius * 2) ||
+       (!hor && lv_area_get_height(&bar->indic_area) > indic_radius * 2)) {
         lv_opa_t bg_opa = draw_rect_dsc.bg_opa;
         lv_opa_t bg_img_opa = draw_rect_dsc.bg_img_opa;
         lv_opa_t border_opa = draw_rect_dsc.border_opa;
@@ -425,7 +437,7 @@ static void draw_indic(lv_event_t * e)
         draw_rect_dsc.bg_img_opa = LV_OPA_TRANSP;
         draw_rect_dsc.border_opa = LV_OPA_TRANSP;
 
-        lv_draw_rect(&bar->indic_area, clip_area, &draw_rect_dsc);
+        lv_draw_rect(draw_ctx, &draw_rect_dsc, &bar->indic_area);
 
         draw_rect_dsc.bg_opa = bg_opa;
         draw_rect_dsc.bg_img_opa = bg_img_opa;
@@ -473,7 +485,7 @@ static void draw_indic(lv_event_t * e)
     int16_t mask_indic_id = lv_draw_mask_add(&mask_indic_param, NULL);
 #endif
 
-    lv_draw_rect(&mask_indic_max_area, clip_area, &draw_rect_dsc);
+    lv_draw_rect(draw_ctx, &draw_rect_dsc, &mask_indic_max_area);
     draw_rect_dsc.border_opa = border_opa;
     draw_rect_dsc.shadow_opa = shadow_opa;
 
@@ -481,7 +493,7 @@ static void draw_indic(lv_event_t * e)
     draw_rect_dsc.bg_opa = LV_OPA_TRANSP;
     draw_rect_dsc.bg_img_opa = LV_OPA_TRANSP;
     draw_rect_dsc.shadow_opa = LV_OPA_TRANSP;
-    lv_draw_rect(&bar->indic_area, clip_area, &draw_rect_dsc);
+    lv_draw_rect(draw_ctx, &draw_rect_dsc, &bar->indic_area);
 
 #if LV_DRAW_COMPLEX
     lv_draw_mask_free_param(&mask_indic_param);
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.h
index b839b1453..1726425b0 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.h
@@ -71,7 +71,7 @@ typedef enum {
  **********************/
 
 /**
- * Create a bar objects
+ * Create a bar object
  * @param parent    pointer to an object, it will be the parent of the new bar
  * @return          pointer to the created bar
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.c
index 0108a8ec5..62f86f794 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.c
@@ -219,7 +219,7 @@ void lv_btnmatrix_set_btn_ctrl(lv_obj_t * obj, uint16_t btn_id, lv_btnmatrix_ctr
     btnm->ctrl_bits[btn_id] |= ctrl;
     invalidate_button_area(obj, btn_id);
 
-    if (ctrl & LV_BTNMATRIX_CTRL_POPOVER) {
+    if(ctrl & LV_BTNMATRIX_CTRL_POPOVER) {
         lv_obj_refresh_ext_draw_size(obj);
     }
 }
@@ -235,7 +235,7 @@ void lv_btnmatrix_clear_btn_ctrl(lv_obj_t * obj, uint16_t btn_id, lv_btnmatrix_c
     btnm->ctrl_bits[btn_id] &= (~ctrl);
     invalidate_button_area(obj, btn_id);
 
-    if (ctrl & LV_BTNMATRIX_CTRL_POPOVER) {
+    if(ctrl & LV_BTNMATRIX_CTRL_POPOVER) {
         lv_obj_refresh_ext_draw_size(obj);
     }
 }
@@ -400,10 +400,11 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
     if(code == LV_EVENT_REFR_EXT_DRAW_SIZE) {
         lv_coord_t * s = lv_event_get_param(e);
-        if (has_popovers_in_top_row(obj)) {
+        if(has_popovers_in_top_row(obj)) {
             /*reserve one row worth of extra space to account for popovers in the top row*/
             *s = btnm->row_cnt > 0 ? lv_obj_get_content_height(obj) / btnm->row_cnt : 0;
-        } else {
+        }
+        else {
             *s = 0;
         }
     }
@@ -505,10 +506,6 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
         /*Invalidate to old pressed area*/;
         invalidate_button_area(obj, btnm->btn_id_sel);
 
-        lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act());
-        if(indev_type == LV_INDEV_TYPE_POINTER || indev_type == LV_INDEV_TYPE_BUTTON) {
-            btnm->btn_id_sel = LV_BTNMATRIX_BTN_NONE;
-        }
     }
     else if(code == LV_EVENT_LONG_PRESSED_REPEAT) {
         if(btnm->btn_id_sel != LV_BTNMATRIX_BTN_NONE) {
@@ -587,7 +584,7 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
         }
         else if(c == LV_KEY_DOWN) {
             lv_coord_t col_gap = lv_obj_get_style_pad_column(obj, LV_PART_MAIN);
-            /*Find the area below the the current*/
+            /*Find the area below the current*/
             if(btnm->btn_id_sel == LV_BTNMATRIX_BTN_NONE) {
                 btnm->btn_id_sel = 0;
                 while(button_is_hidden(btnm->ctrl_bits[btnm->btn_id_sel]) || button_is_inactive(btnm->ctrl_bits[btnm->btn_id_sel])) {
@@ -615,7 +612,7 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
         }
         else if(c == LV_KEY_UP) {
             lv_coord_t col_gap = lv_obj_get_style_pad_column(obj, LV_PART_MAIN);
-            /*Find the area below the the current*/
+            /*Find the area below the current*/
             if(btnm->btn_id_sel == LV_BTNMATRIX_BTN_NONE) {
                 btnm->btn_id_sel = 0;
                 while(button_is_hidden(btnm->ctrl_bits[btnm->btn_id_sel]) || button_is_inactive(btnm->ctrl_bits[btnm->btn_id_sel])) {
@@ -655,7 +652,7 @@ static void draw_main(lv_event_t * e)
     lv_btnmatrix_t * btnm = (lv_btnmatrix_t *)obj;
     if(btnm->btn_cnt == 0) return;
 
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     obj->skip_trans = 1;
 
     lv_area_t area_obj;
@@ -693,7 +690,7 @@ static void draw_main(lv_event_t * e)
 #endif
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.part = LV_PART_ITEMS;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_BTNMATRIX_DRAW_PART_BTN;
@@ -765,13 +762,13 @@ static void draw_main(lv_event_t * e)
 
         lv_coord_t btn_height = lv_area_get_height(&btn_area);
 
-        if ((btn_state & LV_STATE_PRESSED) && (btnm->ctrl_bits[btn_i] & LV_BTNMATRIX_CTRL_POPOVER)) {
+        if((btn_state & LV_STATE_PRESSED) && (btnm->ctrl_bits[btn_i] & LV_BTNMATRIX_CTRL_POPOVER)) {
             /*Push up the upper boundary of the btn area to create the popover*/
             btn_area.y1 -= btn_height;
         }
 
         /*Draw the background*/
-        lv_draw_rect(&btn_area, clip_area, &draw_rect_dsc_act);
+        lv_draw_rect(draw_ctx, &draw_rect_dsc_act, &btn_area);
 
         /*Calculate the size of the text*/
         const lv_font_t * font = draw_label_dsc_act.font;
@@ -796,14 +793,14 @@ static void draw_main(lv_event_t * e)
         btn_area.x2 = btn_area.x1 + txt_size.x;
         btn_area.y2 = btn_area.y1 + txt_size.y;
 
-        if ((btn_state & LV_STATE_PRESSED) && (btnm->ctrl_bits[btn_i] & LV_BTNMATRIX_CTRL_POPOVER)) {
+        if((btn_state & LV_STATE_PRESSED) && (btnm->ctrl_bits[btn_i] & LV_BTNMATRIX_CTRL_POPOVER)) {
             /*Push up the button text into the popover*/
             btn_area.y1 -= btn_height / 2;
             btn_area.y2 -= btn_height / 2;
         }
 
         /*Draw the text*/
-        lv_draw_label(&btn_area, clip_area, &draw_label_dsc_act, txt, NULL);
+        lv_draw_label(draw_ctx, &draw_label_dsc_act, &btn_area, txt, NULL);
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
@@ -828,7 +825,8 @@ static void allocate_btn_areas_and_controls(const lv_obj_t * obj, const char **
     while(map[i] && map[i][0] != '\0') {
         if(strcmp(map[i], "\n") != 0) { /*Do not count line breaks*/
             btn_cnt++;
-        } else {
+        }
+        else {
             btnm->row_cnt++;
         }
         i++;
@@ -979,6 +977,8 @@ static void invalidate_button_area(const lv_obj_t * obj, uint16_t btn_idx)
     lv_area_t obj_area;
 
     lv_btnmatrix_t * btnm = (lv_btnmatrix_t *)obj;;
+    if(btn_idx >= btnm->btn_cnt) return;
+
     lv_area_copy(&btn_area, &btnm->button_areas[btn_idx]);
     lv_obj_get_coords(obj, &obj_area);
 
@@ -998,7 +998,7 @@ static void invalidate_button_area(const lv_obj_t * obj, uint16_t btn_idx)
     btn_area.x2 += obj_area.x1 + row_gap;
     btn_area.y2 += obj_area.y1 + col_gap;
 
-    if ((btn_idx == btnm->btn_id_sel) && (btnm->ctrl_bits[btn_idx] & LV_BTNMATRIX_CTRL_POPOVER)) {
+    if((btn_idx == btnm->btn_id_sel) && (btnm->ctrl_bits[btn_idx] & LV_BTNMATRIX_CTRL_POPOVER)) {
         /*Push up the upper boundary of the btn area to also invalidate the popover*/
         btn_area.y1 -= lv_area_get_height(&btn_area);
     }
@@ -1031,15 +1031,15 @@ static bool has_popovers_in_top_row(lv_obj_t * obj)
 {
     lv_btnmatrix_t * btnm = (lv_btnmatrix_t *)obj;
 
-    if (btnm->row_cnt <= 0) {
+    if(btnm->row_cnt <= 0) {
         return false;
     }
 
     const char ** map_row = btnm->map_p;
     uint16_t btn_cnt = 0;
 
-    while (map_row[btn_cnt] && strcmp(map_row[btn_cnt], "\n") != 0 && map_row[btn_cnt][0] != '\0') {
-        if (button_is_popover(btnm->ctrl_bits[btn_cnt])) {
+    while(map_row[btn_cnt] && strcmp(map_row[btn_cnt], "\n") != 0 && map_row[btn_cnt][0] != '\0') {
+        if(button_is_popover(btnm->ctrl_bits[btn_cnt])) {
             return true;
         }
         btn_cnt++;
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.h
index 351bce31e..cf586d723 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.h
@@ -1,5 +1,5 @@
 /**
- * @file lv_btnm.h
+ * @file lv_btnmatrix.h
  *
  */
 
@@ -78,7 +78,7 @@ typedef enum {
  **********************/
 
 /**
- * Create a button matrix objects
+ * Create a button matrix object
  * @param parent    pointer to an object, it will be the parent of the new button matrix
  * @return          pointer to the created button matrix
  */
@@ -182,7 +182,7 @@ const char ** lv_btnmatrix_get_map(const lv_obj_t * obj);
 
 /**
  * Get the index of the lastly "activated" button by the user (pressed, released, focused etc)
- * Useful in the the `event_cb` to get the text of the button, check if hidden etc.
+ * Useful in the `event_cb` to get the text of the button, check if hidden etc.
  * @param obj       pointer to button matrix object
  * @return          index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset)
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.c
index d5efc402d..a55429bdf 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.c
@@ -14,6 +14,8 @@
 
 #if LV_USE_CANVAS != 0
 
+#include "../draw/sw/lv_draw_sw.h"
+
 /*********************
  *      DEFINES
  *********************/
@@ -28,6 +30,8 @@
  **********************/
 static void lv_canvas_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
 static void lv_canvas_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj);
+static void init_fake_disp(lv_obj_t * canvas, lv_disp_t * disp, lv_disp_drv_t * drv, lv_area_t * clip_area);
+static void deinit_fake_disp(lv_obj_t * canvas, lv_disp_t * disp);
 
 /**********************
  *  STATIC VARIABLES
@@ -137,7 +141,7 @@ void lv_canvas_copy_buf(lv_obj_t * obj, const void * to_copy, lv_coord_t x, lv_c
 
     lv_canvas_t * canvas = (lv_canvas_t *)obj;
 
-    if(x + w >= (lv_coord_t)canvas->dsc.header.w || y + h >= (lv_coord_t)canvas->dsc.header.h) {
+    if(x + w - 1 >= (lv_coord_t)canvas->dsc.header.w || y + h - 1 >= (lv_coord_t)canvas->dsc.header.h) {
         LV_LOG_WARN("lv_canvas_copy_buf: x or y out of the canvas");
         return;
     }
@@ -560,11 +564,20 @@ void lv_canvas_draw_rect(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
 
     /*Create a dummy display to fool the lv_draw function.
      *It will think it draws to real screen.*/
-    lv_area_t mask;
-    mask.x1 = 0;
-    mask.x2 = dsc->header.w - 1;
-    mask.y1 = 0;
-    mask.y2 = dsc->header.h - 1;
+    lv_disp_t fake_disp;
+    lv_disp_drv_t driver;
+    lv_area_t clip_area;
+    init_fake_disp(canvas, &fake_disp, &driver, &clip_area);
+
+    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
+    _lv_refr_set_disp_refreshing(&fake_disp);
+
+    /*Disable anti-aliasing if drawing with transparent color to chroma keyed canvas*/
+    lv_color_t ctransp = LV_COLOR_CHROMA_KEY;
+    if(dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED &&
+       draw_dsc->bg_color.full == ctransp.full) {
+        fake_disp.driver->antialiasing = 0;
+    }
 
     lv_area_t coords;
     coords.x1 = x;
@@ -572,38 +585,12 @@ void lv_canvas_draw_rect(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
     coords.x2 = x + w - 1;
     coords.y2 = y + h - 1;
 
-    lv_disp_t disp;
-    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
-    lv_disp_drv_t driver;
-    lv_memset_00(&disp, sizeof(lv_disp_t));
-    disp.driver = &driver;
-
-    lv_disp_draw_buf_t draw_buf;
-    lv_disp_draw_buf_init(&draw_buf, (void *)dsc->data, NULL, dsc->header.w * dsc->header.h);
-    lv_area_copy(&draw_buf.area, &mask);
-
-    lv_disp_drv_init(disp.driver);
-
-    disp.driver->draw_buf = &draw_buf;
-    disp.driver->hor_res = dsc->header.w;
-    disp.driver->ver_res = dsc->header.h;
-
-    lv_disp_drv_use_generic_set_px_cb(disp.driver, dsc->header.cf);
-
-    /*Disable anti-aliasing if drawing with transparent color to chroma keyed canvas*/
-    lv_color_t ctransp = LV_COLOR_CHROMA_KEY;
-    if(dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED &&
-       draw_dsc->bg_color.full == ctransp.full) {
-        disp.driver->antialiasing = 0;
-    }
-
-    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
-    _lv_refr_set_disp_refreshing(&disp);
-
-    lv_draw_rect(&coords, &mask, draw_dsc);
+    lv_draw_rect(driver.draw_ctx, draw_dsc, &coords);
 
     _lv_refr_set_disp_refreshing(refr_ori);
 
+    deinit_fake_disp(canvas, &fake_disp);
+
     lv_obj_invalidate(canvas);
 }
 
@@ -621,43 +608,25 @@ void lv_canvas_draw_text(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
 
     /*Create a dummy display to fool the lv_draw function.
      *It will think it draws to real screen.*/
-    lv_area_t mask;
-    mask.x1 = 0;
-    mask.x2 = dsc->header.w - 1;
-    mask.y1 = 0;
-    mask.y2 = dsc->header.h - 1;
+    lv_disp_t fake_disp;
+    lv_disp_drv_t driver;
+    lv_area_t clip_area;
+    init_fake_disp(canvas, &fake_disp, &driver, &clip_area);
+
+    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
+    _lv_refr_set_disp_refreshing(&fake_disp);
 
     lv_area_t coords;
     coords.x1 = x;
     coords.y1 = y;
     coords.x2 = x + max_w - 1;
     coords.y2 = dsc->header.h - 1;
-
-    lv_disp_t disp;
-    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
-    lv_disp_drv_t driver;
-    lv_memset_00(&disp, sizeof(lv_disp_t));
-    disp.driver = &driver;
-
-    lv_disp_draw_buf_t draw_buf;
-    lv_disp_draw_buf_init(&draw_buf, (void *)dsc->data, NULL, dsc->header.w * dsc->header.h);
-    lv_area_copy(&draw_buf.area, &mask);
-
-    lv_disp_drv_init(disp.driver);
-
-    disp.driver->draw_buf = &draw_buf;
-    disp.driver->hor_res = dsc->header.w;
-    disp.driver->ver_res = dsc->header.h;
-
-    lv_disp_drv_use_generic_set_px_cb(disp.driver, dsc->header.cf);
-
-    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
-    _lv_refr_set_disp_refreshing(&disp);
-
-    lv_draw_label(&coords, &mask, draw_dsc, txt, NULL);
+    lv_draw_label(driver.draw_ctx, draw_dsc, &coords, txt, NULL);
 
     _lv_refr_set_disp_refreshing(refr_ori);
 
+    deinit_fake_disp(canvas, &fake_disp);
+
     lv_obj_invalidate(canvas);
 }
 
@@ -673,20 +642,21 @@ void lv_canvas_draw_img(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, const voi
         return;
     }
 
-    /*Create a dummy display to fool the lv_draw function.
-     *It will think it draws to real screen.*/
-    lv_area_t mask;
-    mask.x1 = 0;
-    mask.x2 = dsc->header.w - 1;
-    mask.y1 = 0;
-    mask.y2 = dsc->header.h - 1;
-
     lv_img_header_t header;
     lv_res_t res = lv_img_decoder_get_info(src, &header);
     if(res != LV_RES_OK) {
         LV_LOG_WARN("lv_canvas_draw_img: Couldn't get the image data.");
         return;
     }
+    /*Create a dummy display to fool the lv_draw function.
+     *It will think it draws to real screen.*/
+    lv_disp_t fake_disp;
+    lv_disp_drv_t driver;
+    lv_area_t clip_area;
+    init_fake_disp(canvas, &fake_disp, &driver, &clip_area);
+
+    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
+    _lv_refr_set_disp_refreshing(&fake_disp);
 
     lv_area_t coords;
     coords.x1 = x;
@@ -694,31 +664,12 @@ void lv_canvas_draw_img(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, const voi
     coords.x2 = x + header.w - 1;
     coords.y2 = y + header.h - 1;
 
-    lv_disp_t disp;
-    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
-    lv_disp_drv_t driver;
-    lv_memset_00(&disp, sizeof(lv_disp_t));
-    disp.driver = &driver;
-
-    lv_disp_draw_buf_t draw_buf;
-    lv_disp_draw_buf_init(&draw_buf, (void *)dsc->data, NULL, dsc->header.w * dsc->header.h);
-    lv_area_copy(&draw_buf.area, &mask);
-
-    lv_disp_drv_init(disp.driver);
-
-    disp.driver->draw_buf = &draw_buf;
-    disp.driver->hor_res = dsc->header.w;
-    disp.driver->ver_res = dsc->header.h;
-
-    lv_disp_drv_use_generic_set_px_cb(disp.driver, dsc->header.cf);
-
-    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
-    _lv_refr_set_disp_refreshing(&disp);
-
-    lv_draw_img(&coords, &mask, src, draw_dsc);
+    lv_draw_img(driver.draw_ctx, draw_dsc, &coords, src);
 
     _lv_refr_set_disp_refreshing(refr_ori);
 
+    deinit_fake_disp(canvas, &fake_disp);
+
     lv_obj_invalidate(canvas);
 }
 
@@ -733,49 +684,34 @@ void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t points[], uint32_t
         LV_LOG_WARN("lv_canvas_draw_line: can't draw to LV_IMG_CF_INDEXED canvas");
         return;
     }
+
     /*Create a dummy display to fool the lv_draw function.
      *It will think it draws to real screen.*/
-    lv_area_t mask;
-    mask.x1 = 0;
-    mask.x2 = dsc->header.w - 1;
-    mask.y1 = 0;
-    mask.y2 = dsc->header.h - 1;
-
-    lv_disp_t disp;
-    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
+    lv_disp_t fake_disp;
     lv_disp_drv_t driver;
-    lv_memset_00(&disp, sizeof(lv_disp_t));
-    disp.driver = &driver;
+    lv_area_t clip_area;
+    init_fake_disp(canvas, &fake_disp, &driver, &clip_area);
 
-    lv_disp_draw_buf_t draw_buf;
-    lv_disp_draw_buf_init(&draw_buf, (void *)dsc->data, NULL, dsc->header.w * dsc->header.h);
-    lv_area_copy(&draw_buf.area, &mask);
+    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
+    _lv_refr_set_disp_refreshing(&fake_disp);
 
-    lv_disp_drv_init(disp.driver);
-
-    disp.driver->draw_buf = &draw_buf;
-    disp.driver->hor_res = dsc->header.w;
-    disp.driver->ver_res = dsc->header.h;
-
-    lv_disp_drv_use_generic_set_px_cb(disp.driver, dsc->header.cf);
 
     /*Disable anti-aliasing if drawing with transparent color to chroma keyed canvas*/
     lv_color_t ctransp = LV_COLOR_CHROMA_KEY;
     if(dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED &&
        draw_dsc->color.full == ctransp.full) {
-        disp.driver->antialiasing = 0;
+        fake_disp.driver->antialiasing = 0;
     }
 
-    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
-    _lv_refr_set_disp_refreshing(&disp);
-
     uint32_t i;
     for(i = 0; i < point_cnt - 1; i++) {
-        lv_draw_line(&points[i], &points[i + 1], &mask, draw_dsc);
+        lv_draw_line(driver.draw_ctx, draw_dsc, &points[i], &points[i + 1]);
     }
 
     _lv_refr_set_disp_refreshing(refr_ori);
 
+    deinit_fake_disp(canvas, &fake_disp);
+
     lv_obj_invalidate(canvas);
 }
 
@@ -793,44 +729,27 @@ void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32
 
     /*Create a dummy display to fool the lv_draw function.
      *It will think it draws to real screen.*/
-    lv_area_t mask;
-    mask.x1 = 0;
-    mask.x2 = dsc->header.w - 1;
-    mask.y1 = 0;
-    mask.y2 = dsc->header.h - 1;
-
-    lv_disp_t disp;
-    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
+    lv_disp_t fake_disp;
     lv_disp_drv_t driver;
-    lv_memset_00(&disp, sizeof(lv_disp_t));
-    disp.driver = &driver;
+    lv_area_t clip_area;
+    init_fake_disp(canvas, &fake_disp, &driver, &clip_area);
 
-    lv_disp_draw_buf_t draw_buf;
-    lv_disp_draw_buf_init(&draw_buf, (void *)dsc->data, NULL, dsc->header.w * dsc->header.h);
-    lv_area_copy(&draw_buf.area, &mask);
-
-    lv_disp_drv_init(disp.driver);
-
-    disp.driver->draw_buf = &draw_buf;
-    disp.driver->hor_res = dsc->header.w;
-    disp.driver->ver_res = dsc->header.h;
-
-    lv_disp_drv_use_generic_set_px_cb(disp.driver, dsc->header.cf);
+    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
+    _lv_refr_set_disp_refreshing(&fake_disp);
 
     /*Disable anti-aliasing if drawing with transparent color to chroma keyed canvas*/
     lv_color_t ctransp = LV_COLOR_CHROMA_KEY;
     if(dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED &&
        draw_dsc->bg_color.full == ctransp.full) {
-        disp.driver->antialiasing = 0;
+        fake_disp.driver->antialiasing = 0;
     }
 
-    lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
-    _lv_refr_set_disp_refreshing(&disp);
-
-    lv_draw_polygon(points, point_cnt, &mask, draw_dsc);
+    lv_draw_polygon(driver.draw_ctx, draw_dsc, points, point_cnt);
 
     _lv_refr_set_disp_refreshing(refr_ori);
 
+    deinit_fake_disp(canvas, &fake_disp);
+
     lv_obj_invalidate(canvas);
 }
 
@@ -849,44 +768,21 @@ void lv_canvas_draw_arc(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord_
 
     /*Create a dummy display to fool the lv_draw function.
      *It will think it draws to real screen.*/
-    lv_area_t mask;
-    mask.x1 = 0;
-    mask.x2 = dsc->header.w - 1;
-    mask.y1 = 0;
-    mask.y2 = dsc->header.h - 1;
-
-    lv_disp_t disp;
-    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
+    lv_disp_t fake_disp;
     lv_disp_drv_t driver;
-    lv_memset_00(&disp, sizeof(lv_disp_t));
-    disp.driver = &driver;
-
-    lv_disp_draw_buf_t draw_buf;
-    lv_disp_draw_buf_init(&draw_buf, (void *)dsc->data, NULL, dsc->header.w * dsc->header.h);
-    lv_area_copy(&draw_buf.area, &mask);
-
-    lv_disp_drv_init(disp.driver);
-
-    disp.driver->draw_buf = &draw_buf;
-    disp.driver->hor_res = dsc->header.w;
-    disp.driver->ver_res = dsc->header.h;
-
-    lv_disp_drv_use_generic_set_px_cb(disp.driver, dsc->header.cf);
-
-    /*Disable anti-aliasing if drawing with transparent color to chroma keyed canvas*/
-    lv_color_t ctransp = LV_COLOR_CHROMA_KEY;
-    if(dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED &&
-       draw_dsc->color.full == ctransp.full) {
-        disp.driver->antialiasing = 0;
-    }
+    lv_area_t clip_area;
+    init_fake_disp(canvas, &fake_disp, &driver, &clip_area);
 
     lv_disp_t * refr_ori = _lv_refr_get_disp_refreshing();
-    _lv_refr_set_disp_refreshing(&disp);
+    _lv_refr_set_disp_refreshing(&fake_disp);
 
-    lv_draw_arc(x, y, r,  start_angle, end_angle, &mask, draw_dsc);
+    lv_point_t p = {x, y};
+    lv_draw_arc(driver.draw_ctx, draw_dsc, &p, r,  start_angle, end_angle);
 
     _lv_refr_set_disp_refreshing(refr_ori);
 
+    deinit_fake_disp(canvas, &fake_disp);
+
     lv_obj_invalidate(canvas);
 #else
     LV_UNUSED(canvas);
@@ -932,4 +828,43 @@ static void lv_canvas_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
     lv_img_cache_invalidate_src(&canvas->dsc);
 }
 
+
+static void init_fake_disp(lv_obj_t * canvas, lv_disp_t * disp, lv_disp_drv_t * drv, lv_area_t * clip_area)
+{
+    lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
+
+    clip_area->x1 = 0;
+    clip_area->x2 = dsc->header.w - 1;
+    clip_area->y1 = 0;
+    clip_area->y2 = dsc->header.h - 1;
+
+    /*Allocate the fake driver on the stack as the entire display doesn't outlive this function*/
+    lv_memset_00(disp, sizeof(lv_disp_t));
+    disp->driver = drv;
+
+    lv_disp_drv_init(disp->driver);
+    disp->driver->hor_res = dsc->header.w;
+    disp->driver->ver_res = dsc->header.h;
+
+    lv_draw_ctx_t * draw_ctx = lv_mem_alloc(sizeof(lv_draw_sw_ctx_t));
+    LV_ASSERT_MALLOC(draw_ctx);
+    if(draw_ctx == NULL)  return;
+    lv_draw_sw_init_ctx(drv, draw_ctx);
+    disp->driver->draw_ctx = draw_ctx;
+    draw_ctx->clip_area = clip_area;
+    draw_ctx->buf_area = clip_area;
+    draw_ctx->buf = (void *)dsc->data;
+
+    lv_disp_drv_use_generic_set_px_cb(disp->driver, dsc->header.cf);
+}
+
+static void deinit_fake_disp(lv_obj_t * canvas, lv_disp_t * disp)
+{
+    LV_UNUSED(canvas);
+    lv_draw_sw_deinit_ctx(disp->driver, disp->driver->draw_ctx);
+    lv_mem_free(disp->driver->draw_ctx);
+}
+
+
+
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.c
index 2128f2d13..dd3b3d157 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.c
@@ -156,10 +156,7 @@ static void lv_checkbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t * obj = lv_event_get_target(e);
 
-    if(code == LV_EVENT_PRESSED || code == LV_EVENT_RELEASED) {
-        lv_obj_invalidate(obj);
-    }
-    else if(code == LV_EVENT_GET_SELF_SIZE) {
+    if(code == LV_EVENT_GET_SELF_SIZE) {
         lv_point_t * p = lv_event_get_param(e);
         lv_checkbox_t * cb = (lv_checkbox_t *)obj;
 
@@ -188,13 +185,6 @@ static void lv_checkbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
         lv_coord_t m = lv_obj_calculate_ext_draw_size(obj, LV_PART_INDICATOR);
         *s = LV_MAX(*s, m);
     }
-    else if(code == LV_EVENT_RELEASED) {
-        uint32_t v = lv_obj_get_state(obj) & LV_STATE_CHECKED ? 1 : 0;
-        res = lv_event_send(obj, LV_EVENT_VALUE_CHANGED, &v);
-        if(res != LV_RES_OK) return;
-
-        lv_obj_invalidate(obj);
-    }
     else if(code == LV_EVENT_DRAW_MAIN) {
         lv_checkbox_draw(e);
     }
@@ -205,7 +195,7 @@ static void lv_checkbox_draw(lv_event_t * e)
     lv_obj_t * obj = lv_event_get_target(e);
     lv_checkbox_t * cb = (lv_checkbox_t *)obj;
 
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     const lv_font_t * font = lv_obj_get_style_text_font(obj, LV_PART_MAIN);
     lv_coord_t font_h = lv_font_get_line_height(font);
 
@@ -239,7 +229,7 @@ static void lv_checkbox_draw(lv_event_t * e)
     marker_area_transf.y2 += transf_h;
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.rect_dsc = &indic_dsc;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_CHECKBOX_DRAW_PART_BOX;
@@ -247,7 +237,7 @@ static void lv_checkbox_draw(lv_event_t * e)
     part_draw_dsc.part = LV_PART_INDICATOR;
 
     lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-    lv_draw_rect(&marker_area_transf, clip_area, &indic_dsc);
+    lv_draw_rect(draw_ctx, &indic_dsc, &marker_area_transf);
     lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
 
     lv_coord_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN);
@@ -267,6 +257,6 @@ static void lv_checkbox_draw(lv_event_t * e)
     txt_area.y1 = obj->coords.y1 + bg_topp + y_ofs;
     txt_area.y2 = txt_area.y1 + txt_size.y;
 
-    lv_draw_label(&txt_area, clip_area, &txt_dsc, cb->txt, NULL);
+    lv_draw_label(draw_ctx, &txt_dsc, &txt_area, cb->txt, NULL);
 }
 #endif
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.c
index 627bcf63e..e7e650388 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.c
@@ -47,8 +47,8 @@ static void lv_dropdownlist_destructor(const lv_obj_class_t * class_p, lv_obj_t
 static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t * e);
 static void draw_list(lv_event_t * e);
 
-static void draw_box(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint16_t id, lv_state_t state);
-static void draw_box_label(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint16_t id, lv_state_t state);
+static void draw_box(lv_obj_t * dropdown_obj, lv_draw_ctx_t * draw_ctx, uint16_t id, lv_state_t state);
+static void draw_box_label(lv_obj_t * dropdown_obj, lv_draw_ctx_t * draw_ctx, uint16_t id, lv_state_t state);
 static lv_res_t btn_release_handler(lv_obj_t * obj);
 static lv_res_t list_release_handler(lv_obj_t * list_obj);
 static void list_press_handler(lv_obj_t * page);
@@ -328,7 +328,6 @@ lv_obj_t * lv_dropdown_get_list(lv_obj_t * obj)
     lv_dropdown_t * dropdown = (lv_dropdown_t *)obj;
 
     return dropdown->list;
-
 }
 
 const char * lv_dropdown_get_text(lv_obj_t * obj)
@@ -373,7 +372,15 @@ void lv_dropdown_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf
 
     uint32_t i;
     uint32_t line        = 0;
-    size_t txt_len     = strlen(dropdown->options);
+    size_t txt_len;
+
+    if(dropdown->options)  {
+        txt_len     = strlen(dropdown->options);
+    }
+    else {
+        buf[0] = '\0';
+        return;
+    }
 
     for(i = 0; i < txt_len && line != dropdown->sel_opt_id_orig; i++) {
         if(dropdown->options[i] == '\n') line++;
@@ -418,18 +425,14 @@ lv_dir_t lv_dropdown_get_dir(const lv_obj_t * obj)
 
 void lv_dropdown_open(lv_obj_t * dropdown_obj)
 {
+    LV_ASSERT_OBJ(dropdown_obj, MY_CLASS);
+
     lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj;
 
     lv_obj_add_state(dropdown_obj, LV_STATE_CHECKED);
-
-    if(dropdown->list == NULL) {
-        lv_obj_t * list_obj = lv_dropdown_list_create(lv_obj_get_screen(dropdown_obj));
-        ((lv_dropdown_list_t *) list_obj)->dropdown = dropdown_obj;
-        dropdown->list = list_obj;
-        lv_obj_clear_flag(dropdown->list, LV_OBJ_FLAG_CLICK_FOCUSABLE);
-        lv_obj_add_flag(dropdown->list, LV_OBJ_FLAG_IGNORE_LAYOUT);
-        lv_obj_update_layout(dropdown->list);
-    }
+    lv_obj_set_parent(dropdown->list, lv_obj_get_screen(dropdown_obj));
+    lv_obj_move_to_index(dropdown->list, -1);
+    lv_obj_clear_flag(dropdown->list, LV_OBJ_FLAG_HIDDEN);
 
     /*To allow styling the list*/
     lv_event_send(dropdown_obj, LV_EVENT_READY, NULL);
@@ -520,15 +523,25 @@ void lv_dropdown_open(lv_obj_t * dropdown_obj)
 
 void lv_dropdown_close(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+
     lv_obj_clear_state(obj, LV_STATE_CHECKED);
     lv_dropdown_t * dropdown = (lv_dropdown_t *)obj;
 
     dropdown->pr_opt_id = LV_DROPDOWN_PR_NONE;
-    if(dropdown->list) lv_obj_del(dropdown->list);
+    lv_obj_add_flag(dropdown->list, LV_OBJ_FLAG_HIDDEN);
 
     lv_event_send(obj, LV_EVENT_CANCEL, NULL);
 }
 
+bool lv_dropdown_is_open(lv_obj_t * obj)
+{
+    LV_ASSERT_OBJ(obj, MY_CLASS);
+    lv_dropdown_t * dropdown = (lv_dropdown_t *)obj;
+
+    return lv_obj_has_flag(dropdown->list, LV_OBJ_FLAG_HIDDEN) ? false : true;
+}
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
@@ -564,6 +577,10 @@ static void lv_dropdown_constructor(const lv_obj_class_t * class_p, lv_obj_t * o
     lv_obj_add_flag(obj, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
     lv_dropdown_set_options_static(obj, "Option 1\nOption 2\nOption 3");
 
+    dropdown->list = lv_dropdown_list_create(lv_obj_get_screen(obj));
+    lv_dropdown_list_t * list = (lv_dropdown_list_t *)dropdown->list;
+    list->dropdown = obj;
+
     LV_TRACE_OBJ_CREATE("finished");
 }
 
@@ -589,6 +606,10 @@ static void lv_dropdownlist_constructor(const lv_obj_class_t * class_p, lv_obj_t
     LV_TRACE_OBJ_CREATE("begin");
 
     lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_ON_FOCUS);
+    lv_obj_clear_flag(obj, LV_OBJ_FLAG_CLICK_FOCUSABLE);
+    lv_obj_add_flag(obj, LV_OBJ_FLAG_IGNORE_LAYOUT);
+    lv_obj_add_flag(obj, LV_OBJ_FLAG_HIDDEN);
+
     lv_label_create(obj);
 
     LV_TRACE_OBJ_CREATE("finished");
@@ -656,7 +677,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
     else if(code == LV_EVENT_KEY) {
         char c = *((char *)lv_event_get_param(e));
         if(c == LV_KEY_RIGHT || c == LV_KEY_DOWN) {
-            if(dropdown->list == NULL) {
+            if(!lv_dropdown_is_open(obj)) {
                 lv_dropdown_open(obj);
             }
             else if(dropdown->sel_opt_id + 1 < dropdown->option_cnt) {
@@ -666,7 +687,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
         }
         else if(c == LV_KEY_LEFT || c == LV_KEY_UP) {
 
-            if(dropdown->list == NULL) {
+            if(!lv_dropdown_is_open(obj)) {
                 lv_dropdown_open(obj);
             }
             else if(dropdown->sel_opt_id > 0) {
@@ -680,7 +701,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
         }
         else if(c == LV_KEY_ENTER) {
             /* Handle the ENTER key only if it was send by an other object.
-             * Do no process it if ENTER is sent by the dropdown becasue it's handled in LV_EVENT_RELEASED */
+             * Do no process it if ENTER is sent by the dropdown because it's handled in LV_EVENT_RELEASED */
             lv_obj_t * indev_obj = lv_indev_get_obj_act();
             if(indev_obj != obj) {
                 res = btn_release_handler(obj);
@@ -733,7 +754,7 @@ static void draw_main(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_dropdown_t * dropdown = (lv_dropdown_t *)obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
     lv_coord_t border_width = lv_obj_get_style_border_width(obj, LV_PART_MAIN);
     lv_coord_t left = lv_obj_get_style_pad_left(obj, LV_PART_MAIN) + border_width;
@@ -794,7 +815,7 @@ static void draw_main(lv_event_t * e)
         if(symbol_type == LV_IMG_SRC_SYMBOL) {
             symbol_area.y1 = obj->coords.y1 + top;
             symbol_area.y2 = symbol_area.y1 + symbol_h - 1;
-            lv_draw_label(&symbol_area, clip_area, &symbol_dsc, dropdown->symbol, NULL);
+            lv_draw_label(draw_ctx, &symbol_dsc, &symbol_area, dropdown->symbol, NULL);
         }
         else {
             symbol_area.y1 = obj->coords.y1 + (lv_obj_get_height(obj) - symbol_h) / 2;
@@ -805,7 +826,7 @@ static void draw_main(lv_event_t * e)
             img_dsc.pivot.x = symbol_w / 2;
             img_dsc.pivot.y = symbol_h / 2;
             img_dsc.angle = lv_obj_get_style_transform_angle(obj, LV_PART_INDICATOR);
-            lv_draw_img(&symbol_area, clip_area, dropdown->symbol, &img_dsc);
+            lv_draw_img(draw_ctx, &img_dsc, &symbol_area, dropdown->symbol);
         }
     }
 
@@ -836,7 +857,7 @@ static void draw_main(lv_event_t * e)
             txt_area.x2 = txt_area.x1 + size.x;
         }
     }
-    lv_draw_label(&txt_area, clip_area, &label_dsc, opt_txt, NULL);
+    lv_draw_label(draw_ctx, &label_dsc, &txt_area, opt_txt, NULL);
 
     if(dropdown->text == NULL) {
         lv_mem_buf_release((char *)opt_txt);
@@ -849,37 +870,37 @@ static void draw_list(lv_event_t * e)
     lv_dropdown_list_t * list = (lv_dropdown_list_t *)list_obj;
     lv_obj_t * dropdown_obj = list->dropdown;
     lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
-    /*Draw the box labels if the list is not being deleted*/
-    if(dropdown->list) {
-        /* Clip area might be too large too to shadow but
-         * the selected option can be drawn on only the background*/
-        lv_area_t clip_area_core;
-        bool has_common;
-        has_common = _lv_area_intersect(&clip_area_core, clip_area, &dropdown->list->coords);
-        if(has_common) {
-            if(dropdown->selected_highlight) {
-                if(dropdown->pr_opt_id == dropdown->sel_opt_id) {
-                    draw_box(dropdown_obj, &clip_area_core, dropdown->pr_opt_id, LV_STATE_CHECKED | LV_STATE_PRESSED);
-                    draw_box_label(dropdown_obj, &clip_area_core, dropdown->pr_opt_id, LV_STATE_CHECKED | LV_STATE_PRESSED);
-                }
-                else {
-                    draw_box(dropdown_obj, &clip_area_core, dropdown->pr_opt_id, LV_STATE_PRESSED);
-                    draw_box_label(dropdown_obj, &clip_area_core, dropdown->pr_opt_id, LV_STATE_PRESSED);
-                    draw_box(dropdown_obj, &clip_area_core, dropdown->sel_opt_id, LV_STATE_CHECKED);
-                    draw_box_label(dropdown_obj, &clip_area_core, dropdown->sel_opt_id, LV_STATE_CHECKED);
-                }
+    /* Clip area might be too large too to shadow but
+     * the selected option can be drawn on only the background*/
+    lv_area_t clip_area_core;
+    bool has_common;
+    has_common = _lv_area_intersect(&clip_area_core, draw_ctx->clip_area, &dropdown->list->coords);
+    if(has_common) {
+        const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+        draw_ctx->clip_area = &clip_area_core;
+        if(dropdown->selected_highlight) {
+            if(dropdown->pr_opt_id == dropdown->sel_opt_id) {
+                draw_box(dropdown_obj, draw_ctx, dropdown->pr_opt_id, LV_STATE_CHECKED | LV_STATE_PRESSED);
+                draw_box_label(dropdown_obj, draw_ctx, dropdown->pr_opt_id, LV_STATE_CHECKED | LV_STATE_PRESSED);
             }
             else {
-                draw_box(dropdown_obj, &clip_area_core, dropdown->pr_opt_id, LV_STATE_PRESSED);
-                draw_box_label(dropdown_obj, &clip_area_core, dropdown->pr_opt_id, LV_STATE_PRESSED);
+                draw_box(dropdown_obj, draw_ctx, dropdown->pr_opt_id, LV_STATE_PRESSED);
+                draw_box_label(dropdown_obj, draw_ctx, dropdown->pr_opt_id, LV_STATE_PRESSED);
+                draw_box(dropdown_obj, draw_ctx, dropdown->sel_opt_id, LV_STATE_CHECKED);
+                draw_box_label(dropdown_obj, draw_ctx, dropdown->sel_opt_id, LV_STATE_CHECKED);
             }
         }
+        else {
+            draw_box(dropdown_obj, draw_ctx, dropdown->pr_opt_id, LV_STATE_PRESSED);
+            draw_box_label(dropdown_obj, draw_ctx, dropdown->pr_opt_id, LV_STATE_PRESSED);
+        }
+        draw_ctx->clip_area = clip_area_ori;
     }
 }
 
-static void draw_box(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint16_t id, lv_state_t state)
+static void draw_box(lv_obj_t * dropdown_obj, lv_draw_ctx_t * draw_ctx, uint16_t id, lv_state_t state)
 {
     if(id == LV_DROPDOWN_PR_NONE) return;
 
@@ -911,13 +932,13 @@ static void draw_box(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint1
     lv_draw_rect_dsc_t sel_rect;
     lv_draw_rect_dsc_init(&sel_rect);
     lv_obj_init_draw_rect_dsc(list_obj,  LV_PART_SELECTED, &sel_rect);
-    lv_draw_rect(&rect_area, clip_area, &sel_rect);
+    lv_draw_rect(draw_ctx, &sel_rect, &rect_area);
 
     list_obj->state = state_ori;
     list_obj->skip_trans = 0;
 }
 
-static void draw_box_label(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint16_t id, lv_state_t state)
+static void draw_box_label(lv_obj_t * dropdown_obj, lv_draw_ctx_t * draw_ctx, uint16_t id, lv_state_t state)
 {
     if(id == LV_DROPDOWN_PR_NONE) return;
 
@@ -926,7 +947,7 @@ static void draw_box_label(lv_obj_t * dropdown_obj, const lv_area_t * clip_area,
     lv_state_t state_orig = list_obj->state;
 
     if(state != list_obj->state) {
-        list_obj->state =  state;
+        list_obj->state = state;
         list_obj->skip_trans = 1;
     }
 
@@ -952,9 +973,12 @@ static void draw_box_label(lv_obj_t * dropdown_obj, const lv_area_t * clip_area,
     area_sel.x2 = list_obj->coords.x2;
     lv_area_t mask_sel;
     bool area_ok;
-    area_ok = _lv_area_intersect(&mask_sel, clip_area, &area_sel);
+    area_ok = _lv_area_intersect(&mask_sel, draw_ctx->clip_area, &area_sel);
     if(area_ok) {
-        lv_draw_label(&label->coords, &mask_sel, &label_dsc, lv_label_get_text(label), NULL);
+        const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+        draw_ctx->clip_area = &mask_sel;
+        lv_draw_label(draw_ctx, &label_dsc, &label->coords, lv_label_get_text(label), NULL);
+        draw_ctx->clip_area = clip_area_ori;
     }
     list_obj->state = state_orig;
     list_obj->skip_trans = 0;
@@ -966,7 +990,7 @@ static lv_res_t btn_release_handler(lv_obj_t * obj)
     lv_dropdown_t * dropdown = (lv_dropdown_t *)obj;
     lv_indev_t * indev = lv_indev_get_act();
     if(lv_indev_get_scroll_obj(indev) == NULL) {
-        if(dropdown->list) {
+        if(lv_dropdown_is_open(obj)) {
             lv_dropdown_close(obj);
             if(dropdown->sel_opt_id_orig != dropdown->sel_opt_id) {
                 dropdown->sel_opt_id_orig = dropdown->sel_opt_id;
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.h
index 402a37ce5..63412f73e 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.h
@@ -40,7 +40,7 @@ typedef struct {
     lv_obj_t * list;                /**< The dropped down list*/
     const char * text;              /**< Text to display on the dropdown's button*/
     const void * symbol;            /**< Arrow or other icon when the drop-down list is closed*/
-    char * options;                 /**< Options in a a '\n' separated list*/
+    char * options;                 /**< Options in a '\n' separated list*/
     uint16_t option_cnt;            /**< Number of options*/
     uint16_t sel_opt_id;            /**< Index of the currently selected option*/
     uint16_t sel_opt_id_orig;       /**< Store the original index on focus*/
@@ -63,7 +63,7 @@ extern const  lv_obj_class_t lv_dropdownlist_class;
  **********************/
 
 /**
- * Create a drop-down list objects
+ * Create a drop-down list object
  * @param parent pointer to an object, it will be the parent of the new drop-down list
  * @return pointer to the created drop-down list
  */
@@ -76,7 +76,7 @@ lv_obj_t * lv_dropdown_create(lv_obj_t * parent);
 /**
  * Set text of the drop-down list's button.
  * If set to `NULL` the selected option's text will be displayed on the button.
- * If set to a specific text then that text will be shown regardless the selected option.
+ * If set to a specific text then that text will be shown regardless of the selected option.
  * @param obj       pointer to a drop-down list object
  * @param txt       the text as a string (Only its pointer is saved)
  */
@@ -107,7 +107,7 @@ void lv_dropdown_set_options_static(lv_obj_t * obj, const char * options);
 void lv_dropdown_add_option(lv_obj_t * obj, const char * option, uint32_t pos);
 
 /**
- * Clear all options in a drop-down list.  Works with both static and dynamic optins.
+ * Clear all options in a drop-down list.  Works with both static and dynamic options.
  * @param obj       pointer to drop-down list object
  */
 void lv_dropdown_clear_options(lv_obj_t * obj);
@@ -127,7 +127,7 @@ void lv_dropdown_set_selected(lv_obj_t * obj, uint16_t sel_opt);
 void lv_dropdown_set_dir(lv_obj_t * obj, lv_dir_t dir);
 
 /**
- * Set an arrow or other symbol to display when on drop-down list's button.  Typically a down caret or arrow.
+ * Set an arrow or other symbol to display when on drop-down list's button. Typically a down caret or arrow.
  * @param obj       pointer to drop-down list object
  * @param symbol    a text like `LV_SYMBOL_DOWN`, an image (pointer or path) or NULL to not draw symbol icon
  * @note angle and zoom transformation can be applied if the symbol is an image.
@@ -226,6 +226,12 @@ void lv_dropdown_open(lv_obj_t * dropdown_obj);
  */
 void lv_dropdown_close(lv_obj_t * obj);
 
+/**
+ * Tells whether the list is opened or not
+ * @param obj       pointer to a drop-down list object
+ * @return          true if the list os opened
+ */
+bool lv_dropdown_is_open(lv_obj_t * obj);
 
 /**********************
  *      MACROS
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.c
index 126e8805b..7a1f255e9 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.c
@@ -195,6 +195,7 @@ void lv_img_set_angle(lv_obj_t * obj, int16_t angle)
 
     lv_coord_t transf_angle = lv_obj_get_style_transform_angle(obj, LV_PART_MAIN);
 
+    lv_obj_update_layout(obj);  /*Be sure the object's size is calculated*/
     lv_coord_t w = lv_obj_get_width(obj);
     lv_coord_t h = lv_obj_get_height(obj);
     lv_area_t a;
@@ -227,6 +228,7 @@ void lv_img_set_pivot(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
     lv_coord_t transf_angle = lv_obj_get_style_transform_angle(obj, LV_PART_MAIN);
     transf_angle += img->angle;
 
+    lv_obj_update_layout(obj);  /*Be sure the object's size is calculated*/
     lv_coord_t w = lv_obj_get_width(obj);
     lv_coord_t h = lv_obj_get_height(obj);
     lv_area_t a;
@@ -261,6 +263,7 @@ void lv_img_set_zoom(lv_obj_t * obj, uint16_t zoom)
     lv_coord_t transf_angle = lv_obj_get_style_transform_angle(obj, LV_PART_MAIN);
     transf_angle += img->angle;
 
+    lv_obj_update_layout(obj);  /*Be sure the object's size is calculated*/
     lv_coord_t w = lv_obj_get_width(obj);
     lv_coord_t h = lv_obj_get_height(obj);
     lv_area_t a;
@@ -635,7 +638,7 @@ static void draw_img(lv_event_t * e)
             if(img->h == 0 || img->w == 0) return;
             if(zoom_final == 0) return;
 
-            const lv_area_t * clip_area = lv_event_get_param(e);
+            lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
             lv_area_t img_max_area;
             lv_area_copy(&img_max_area, &obj->coords);
@@ -674,8 +677,10 @@ static void draw_img(lv_event_t * e)
                 img_clip_area.y1 = bg_coords.y1 + ptop;
                 img_clip_area.x2 = bg_coords.x2 - pright;
                 img_clip_area.y2 = bg_coords.y2 - pbottom;
+                const lv_area_t * clip_area_ori = draw_ctx->clip_area;
 
-                _lv_area_intersect(&img_clip_area, clip_area, &img_clip_area);
+                if(!_lv_area_intersect(&img_clip_area, draw_ctx->clip_area, &img_clip_area)) return;
+                draw_ctx->clip_area = &img_clip_area;
 
                 lv_area_t coords_tmp;
                 coords_tmp.y1 = img_max_area.y1 + img->offset.y;
@@ -688,21 +693,22 @@ static void draw_img(lv_event_t * e)
                     coords_tmp.x2 = coords_tmp.x1 + img->w - 1;
 
                     for(; coords_tmp.x1 < img_max_area.x2; coords_tmp.x1 += img_size_final.x, coords_tmp.x2 += img_size_final.x) {
-                        lv_draw_img(&coords_tmp, &img_clip_area, img->src, &img_dsc);
+                        lv_draw_img(draw_ctx, &img_dsc, &coords_tmp, img->src);
                     }
                 }
+                draw_ctx->clip_area = clip_area_ori;
             }
             else if(img->src_type == LV_IMG_SRC_SYMBOL) {
                 lv_draw_label_dsc_t label_dsc;
                 lv_draw_label_dsc_init(&label_dsc);
                 lv_obj_init_draw_label_dsc(obj, LV_PART_MAIN, &label_dsc);
 
-                lv_draw_label(&obj->coords, clip_area, &label_dsc, img->src, NULL);
+                lv_draw_label(draw_ctx, &label_dsc, &obj->coords, img->src, NULL);
             }
             else {
                 /*Trigger the error handler of image draw*/
                 LV_LOG_WARN("draw_img: image source type is unknown");
-                lv_draw_img(&obj->coords, clip_area, NULL, NULL);
+                lv_draw_img(draw_ctx, NULL, &obj->coords, NULL);
             }
         }
     }
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.h
index cf96c717e..2a0056431 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.h
@@ -60,7 +60,7 @@ enum {
 
     /** If the object size is set to SIZE_CONTENT, then object size equals zoomed image size.
      *  It causes layout recalculation.
-     *  If the object size is set explicitly the the image will be cropped if zoomed in.*/
+     *  If the object size is set explicitly, the image will be cropped when zoomed in.*/
     LV_IMG_SIZE_MODE_REAL,
 };
 
@@ -71,7 +71,7 @@ typedef uint8_t lv_img_size_mode_t;
  **********************/
 
 /**
- * Create a image objects
+ * Create an image object
  * @param parent pointer to an object, it will be the parent of the new image
  * @return pointer to the created image
  */
@@ -82,7 +82,7 @@ lv_obj_t * lv_img_create(lv_obj_t * parent);
  *====================*/
 
 /**
- * Set the image data to display on the the object
+ * Set the image data to display on the object
  * @param obj       pointer to an image object
  * @param src_img   1) pointer to an ::lv_img_dsc_t descriptor (converted by LVGL's image converter) (e.g. &my_img) or
  *                  2) path to an image file (e.g. "S:/dir/img.bin")or
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.c
index 39161fb88..0b8a1657a 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.c
@@ -329,7 +329,7 @@ void lv_label_get_letter_pos(const lv_obj_t * obj, uint32_t char_id, lv_point_t
 
     /*Search the line of the index letter*/;
     while(txt[new_line_start] != '\0') {
-        new_line_start += _lv_txt_get_next_line(&txt[line_start], font, letter_space, max_w, flag);
+        new_line_start += _lv_txt_get_next_line(&txt[line_start], font, letter_space, max_w, NULL, flag);
         if(byte_id < new_line_start || txt[new_line_start] == '\0')
             break; /*The line of 'index' letter begins at 'line_start'*/
 
@@ -355,7 +355,7 @@ void lv_label_get_letter_pos(const lv_obj_t * obj, uint32_t char_id, lv_point_t
     /*Handle Bidi*/
     if(new_line_start == byte_id) {
         visual_byte_pos = base_dir == LV_BASE_DIR_RTL ? 0 : byte_id - line_start;
-        bidi_txt =  &txt[line_start];
+        bidi_txt = &txt[line_start];
     }
     else {
         uint32_t line_char_id = _lv_txt_encoded_get_char_id(&txt[line_start], byte_id - line_start);
@@ -430,7 +430,7 @@ uint32_t lv_label_get_letter_on(const lv_obj_t * obj, lv_point_t * pos_in)
 
     /*Search the line of the index letter*/;
     while(txt[line_start] != '\0') {
-        new_line_start += _lv_txt_get_next_line(&txt[line_start], font, letter_space, max_w, flag);
+        new_line_start += _lv_txt_get_next_line(&txt[line_start], font, letter_space, max_w, NULL, flag);
 
         if(pos.y <= y + letter_height) {
             /*The line is found (stored in 'line_start')*/
@@ -548,7 +548,7 @@ bool lv_label_is_char_under_pos(const lv_obj_t * obj, lv_point_t * pos)
 
     /*Search the line of the index letter*/;
     while(txt[line_start] != '\0') {
-        new_line_start += _lv_txt_get_next_line(&txt[line_start], font, letter_space, max_w, flag);
+        new_line_start += _lv_txt_get_next_line(&txt[line_start], font, letter_space, max_w, NULL, flag);
 
         if(pos->y <= y + letter_height) break; /*The line is found (stored in 'line_start')*/
         y += letter_height + line_space;
@@ -792,7 +792,7 @@ static void draw_main(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_label_t * label = (lv_label_t *)obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
     lv_area_t txt_coords;
     lv_obj_get_content_coords(obj, &txt_coords);
@@ -819,8 +819,8 @@ static void draw_main(lv_event_t * e)
         label_draw_dsc.sel_bg_color = lv_obj_get_style_bg_color(obj, LV_PART_SELECTED);
     }
 
-    /* In SROLL and SROLL_CIRC mode the CENTER and RIGHT are pointless so remove them.
-     * (In addition they will result misalignment is this case)*/
+    /* In SCROLL and SCROLL_CIRCULAR mode the CENTER and RIGHT are pointless, so remove them.
+     * (In addition, they will create misalignment in this situation)*/
     if((label->long_mode == LV_LABEL_LONG_SCROLL || label->long_mode == LV_LABEL_LONG_SCROLL_CIRCULAR) &&
        (label_draw_dsc.align == LV_TEXT_ALIGN_CENTER || label_draw_dsc.align == LV_TEXT_ALIGN_RIGHT)) {
         lv_point_t size;
@@ -841,7 +841,7 @@ static void draw_main(lv_event_t * e)
 #endif
 
     lv_area_t txt_clip;
-    bool is_common = _lv_area_intersect(&txt_clip, &txt_coords, clip_area);
+    bool is_common = _lv_area_intersect(&txt_clip, &txt_coords, draw_ctx->clip_area);
     if(!is_common) return;
 
     if(label->long_mode == LV_LABEL_LONG_WRAP) {
@@ -849,12 +849,18 @@ static void draw_main(lv_event_t * e)
         lv_area_move(&txt_coords, 0, -s);
         txt_coords.y2 = obj->coords.y2;
     }
-
     if(label->long_mode == LV_LABEL_LONG_SCROLL || label->long_mode == LV_LABEL_LONG_SCROLL_CIRCULAR) {
-        lv_draw_label(&txt_coords, &txt_clip, &label_draw_dsc, label->text, hint);
-    } else {
-        lv_draw_label(&txt_coords, clip_area, &label_draw_dsc, label->text, hint);
+        const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+        draw_ctx->clip_area = &txt_clip;
+        lv_draw_label(draw_ctx, &label_draw_dsc, &txt_coords, label->text, hint);
+        draw_ctx->clip_area = clip_area_ori;
     }
+    else {
+        lv_draw_label(draw_ctx, &label_draw_dsc, &txt_coords, label->text, hint);
+    }
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &txt_clip;
 
     if(label->long_mode == LV_LABEL_LONG_SCROLL_CIRCULAR) {
         lv_point_t size;
@@ -867,7 +873,7 @@ static void draw_main(lv_event_t * e)
                                    lv_font_get_glyph_width(label_draw_dsc.font, ' ', ' ') * LV_LABEL_WAIT_CHAR_COUNT;
             label_draw_dsc.ofs_y = label->offset.y;
 
-            lv_draw_label(&txt_coords, &txt_clip, &label_draw_dsc, label->text, hint);
+            lv_draw_label(draw_ctx, &label_draw_dsc, &txt_coords, label->text, hint);
         }
 
         /*Draw the text again below the original to make a circular effect */
@@ -875,9 +881,11 @@ static void draw_main(lv_event_t * e)
             label_draw_dsc.ofs_x = label->offset.x;
             label_draw_dsc.ofs_y = label->offset.y + size.y + lv_font_get_line_height(label_draw_dsc.font);
 
-            lv_draw_label(&txt_coords, &txt_clip, &label_draw_dsc, label->text, hint);
+            lv_draw_label(draw_ctx, &label_draw_dsc, &txt_coords, label->text, hint);
         }
     }
+
+    draw_ctx->clip_area = clip_area_ori;
 }
 
 /**
@@ -910,7 +918,7 @@ static void lv_label_refr_text(lv_obj_t * obj)
 
     lv_obj_refresh_self_size(obj);
 
-    /*In scroll mode start an offset animations*/
+    /*In scroll mode start an offset animation*/
     if(label->long_mode == LV_LABEL_LONG_SCROLL) {
         uint16_t anim_speed = lv_obj_get_style_anim_speed(obj, LV_PART_MAIN);
         if(anim_speed == 0) anim_speed = LV_LABEL_DEF_SCROLL_SPEED;
@@ -1085,6 +1093,9 @@ static void lv_label_refr_text(lv_obj_t * obj)
         if(size.y <= lv_area_get_height(&txt_coords)) { /*No dots are required, the text is short enough*/
             label->dot_end = LV_LABEL_DOT_END_INV;
         }
+        else if(size.y <= lv_font_get_line_height(font)) { /*No dots are required for one-line texts*/
+            label->dot_end = LV_LABEL_DOT_END_INV;
+        }
         else if(_lv_txt_get_encoded_length(label->text) <= LV_LABEL_DOT_NUM) {   /*Don't turn to dots all the characters*/
             label->dot_end = LV_LABEL_DOT_END_INV;
         }
@@ -1123,7 +1134,7 @@ static void lv_label_refr_text(lv_obj_t * obj)
             for(i = 0; i <= LV_LABEL_DOT_NUM; i++) {
                 len += _lv_txt_encoded_size(&label->text[byte_id]);
                 _lv_txt_encoded_next(label->text, &byte_id);
-                if (len > LV_LABEL_DOT_NUM || byte_id > txt_len) {
+                if(len > LV_LABEL_DOT_NUM || byte_id > txt_len) {
                     break;
                 }
             }
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.h
index b9a0e5013..342e00417 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.h
@@ -69,11 +69,11 @@ typedef struct {
 #endif
 
     lv_point_t offset; /*Text draw position offset*/
-    lv_label_long_mode_t long_mode : 3; /*Determinate what to do with the long texts*/
+    lv_label_long_mode_t long_mode : 3; /*Determine what to do with the long texts*/
     uint8_t static_txt : 1;             /*Flag to indicate the text is static*/
     uint8_t recolor : 1;                /*Enable in-line letter re-coloring*/
-    uint8_t expand : 1;                 /*Ignore real width (used by the library with LV_LABEL_LONG_SROLL)*/
-    uint8_t dot_tmp_alloc : 1; /*1: dot_tmp has been allocated;.0: dot_tmp directly holds up to 4 bytes of characters*/
+    uint8_t expand : 1;                 /*Ignore real width (used by the library with LV_LABEL_LONG_SCROLL)*/
+    uint8_t dot_tmp_alloc : 1;         /*1: dot is allocated, 0: dot directly holds up to 4 chars*/
 } lv_label_t;
 
 extern const lv_obj_class_t lv_label_class;
@@ -83,7 +83,7 @@ extern const lv_obj_class_t lv_label_class;
  **********************/
 
 /**
- * Create a label objects
+ * Create a label object
  * @param parent    pointer to an object, it will be the parent of the new label.
  * @return          pointer to the created button
  */
@@ -95,14 +95,14 @@ lv_obj_t * lv_label_create(lv_obj_t * parent);
 
 /**
  * Set a new text for a label. Memory will be allocated to store the text by the label.
- * @param label         pointer to a label object
+ * @param obj           pointer to a label object
  * @param text          '\0' terminated character string. NULL to refresh with the current text.
  */
 void lv_label_set_text(lv_obj_t * obj, const char * text);
 
 /**
  * Set a new formatted text for a label. Memory will be allocated to store the text by the label.
- * @param label         pointer to a label object
+ * @param obj           pointer to a label object
  * @param fmt           `printf`-like format
  * @example lv_label_set_text_fmt(label1, "%d user", user_num);
  */
@@ -111,14 +111,14 @@ void lv_label_set_text_fmt(lv_obj_t * obj, const char * fmt, ...) LV_FORMAT_ATTR
 /**
  * Set a static text. It will not be saved by the label so the 'text' variable
  * has to be 'alive' while the label exists.
- * @param label         pointer to a label object
+ * @param obj           pointer to a label object
  * @param text          pointer to a text. NULL to refresh with the current text.
  */
 void lv_label_set_text_static(lv_obj_t * obj, const char * text);
 
 /**
  * Set the behavior of the label with longer text then the object size
- * @param label         pointer to a label object
+ * @param obj           pointer to a label object
  * @param long_mode     the new mode from 'lv_label_long_mode' enum.
  *                      In LV_LONG_WRAP/DOT/SCROLL/SCROLL_CIRC the size of the label should be set AFTER this function
  */
@@ -126,7 +126,7 @@ void lv_label_set_long_mode(lv_obj_t * obj, lv_label_long_mode_t long_mode);
 
 /**
  * Enable the recoloring by in-line commands
- * @param label         pointer to a label object
+ * @param obj           pointer to a label object
  * @param en            true: enable recoloring, false: disable
  * @example "This is a #ff0000 red# word"
  */
@@ -152,7 +152,7 @@ void lv_label_set_text_sel_end(lv_obj_t * obj, uint32_t index);
 
 /**
  * Get the text of a label
- * @param obj     pointer to a label object
+ * @param obj       pointer to a label object
  * @return          the text of the label
  */
 char * lv_label_get_text(const lv_obj_t * obj);
@@ -191,9 +191,9 @@ uint32_t lv_label_get_letter_on(const lv_obj_t * obj, lv_point_t * pos_in);
 
 /**
  * Check if a character is drawn under a point.
- * @param label Label object
- * @param pos Point to check for character under
- * @return whether a character is drawn under the point
+ * @param obj       pointer to a label object
+ * @param pos       Point to check for character under
+ * @return          whether a character is drawn under the point
  */
 bool lv_label_is_char_under_pos(const lv_obj_t * obj, lv_point_t * pos);
 
@@ -226,7 +226,7 @@ void lv_label_ins_text(lv_obj_t * obj, uint32_t pos, const char * txt);
 
 /**
  * Delete characters from a label. The label text can not be static.
- * @param label     pointer to a label object
+ * @param obj       pointer to a label object
  * @param pos       character index from where to cut. Expressed in character index and not byte index.
  *                  0: start in from of the first character
  * @param cnt       number of characters to cut
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.c
index e73e6e89e..6bb6cd975 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.c
@@ -162,7 +162,7 @@ static void lv_line_event(const lv_obj_class_t * class_p, lv_event_t * e)
     }
     else if(code == LV_EVENT_DRAW_MAIN) {
         lv_line_t * line = (lv_line_t *)obj;
-        const lv_area_t * clip_area = lv_event_get_param(e);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
         if(line->point_num == 0 || line->point_array == NULL) return;
 
@@ -193,7 +193,7 @@ static void lv_line_event(const lv_obj_class_t * class_p, lv_event_t * e)
                 p1.y = h - line->point_array[i].y + y_ofs;
                 p2.y = h - line->point_array[i + 1].y + y_ofs;
             }
-            lv_draw_line(&p1, &p2, clip_area, &line_dsc);
+            lv_draw_line(draw_ctx, &line_dsc, &p1, &p2);
             line_dsc.round_start = 0;   /*Draw the rounding only on the end points after the first line*/
         }
     }
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.h
index 4ba05e88f..54fa248b5 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.h
@@ -42,8 +42,8 @@ extern const lv_obj_class_t lv_line_class;
  **********************/
 
 /**
- * Create a line objects
- * @param par pointer to an object, it will be the parent of the new line
+ * Create a line object
+ * @param parent pointer to an object, it will be the parent of the new line
  * @return pointer to the created line
  */
 lv_obj_t * lv_line_create(lv_obj_t * parent);
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.h
index b7149bca8..9de5285b5 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.h
@@ -46,7 +46,7 @@ extern const lv_obj_class_t lv_templ_class;
  **********************/
 
 /**
- * Create a templ objects
+ * Create a templ object
  * @param parent    pointer to an object, it will be the parent of the new templ
  * @return          pointer to the created bar
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.c
index fa558782d..d66f8595f 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.c
@@ -72,7 +72,7 @@ const lv_obj_class_t lv_roller_label_class  = {
 
 /**
  * Create a roller object
- * @param par pointer to an object, it will be the parent of the new roller
+ * @param parent pointer to an object, it will be the parent of the new roller
  * @return pointer to the created roller
  */
 lv_obj_t * lv_roller_create(lv_obj_t * parent)
@@ -299,7 +299,7 @@ static void lv_roller_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj
     roller->sel_opt_id_ori = 0;
 
     lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
-    lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN);
+    lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN_VER);
 
     LV_LOG_INFO("begin");
     lv_obj_t * label = lv_obj_class_create_obj(&lv_roller_label_class, obj);
@@ -325,17 +325,17 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
     if(code == LV_EVENT_GET_SELF_SIZE) {
         lv_point_t * p = lv_event_get_param(e);
-        p->x =  get_selected_label_width(obj);
+        p->x = get_selected_label_width(obj);
     }
     else if(code == LV_EVENT_STYLE_CHANGED) {
         lv_obj_t * label = get_label(obj);
         /*Be sure the label's style is updated before processing the roller*/
         if(label) lv_event_send(label, LV_EVENT_STYLE_CHANGED, NULL);
         lv_obj_refresh_self_size(obj);
-        refr_position(obj, false);
+        refr_position(obj, LV_ANIM_OFF);
     }
     else if(code == LV_EVENT_SIZE_CHANGED) {
-        refr_position(obj, false);
+        refr_position(obj, LV_ANIM_OFF);
     }
     else if(code == LV_EVENT_PRESSED) {
         roller->moved = 0;
@@ -351,7 +351,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
             roller->moved = 1;
         }
     }
-    else if(code == LV_EVENT_RELEASED) {
+    else if(code == LV_EVENT_RELEASED || code == LV_EVENT_PRESS_LOST) {
         release_handler(obj);
     }
     else if(code == LV_EVENT_FOCUSED) {
@@ -365,7 +365,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
             if(!editing) {
                 if(roller->sel_opt_id != roller->sel_opt_id_ori) {
                     roller->sel_opt_id = roller->sel_opt_id_ori;
-                    refr_position(obj, true);
+                    refr_position(obj, LV_ANIM_ON);
                 }
             }
             /*Save the current state when entered to edit mode*/
@@ -382,7 +382,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
         /*Revert the original state*/
         if(roller->sel_opt_id != roller->sel_opt_id_ori) {
             roller->sel_opt_id = roller->sel_opt_id_ori;
-            refr_position(obj, true);
+            refr_position(obj, LV_ANIM_ON);
         }
     }
     else if(code == LV_EVENT_KEY) {
@@ -390,7 +390,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
         if(c == LV_KEY_RIGHT || c == LV_KEY_DOWN) {
             if(roller->sel_opt_id + 1 < roller->option_cnt) {
                 uint16_t ori_id = roller->sel_opt_id_ori; /*lv_roller_set_selected will overwrite this*/
-                lv_roller_set_selected(obj, roller->sel_opt_id + 1, true);
+                lv_roller_set_selected(obj, roller->sel_opt_id + 1, LV_ANIM_ON);
                 roller->sel_opt_id_ori = ori_id;
             }
         }
@@ -398,7 +398,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
             if(roller->sel_opt_id > 0) {
                 uint16_t ori_id = roller->sel_opt_id_ori; /*lv_roller_set_selected will overwrite this*/
 
-                lv_roller_set_selected(obj, roller->sel_opt_id - 1, true);
+                lv_roller_set_selected(obj, roller->sel_opt_id - 1, LV_ANIM_ON);
                 roller->sel_opt_id_ori = ori_id;
             }
         }
@@ -450,17 +450,17 @@ static void draw_main(lv_event_t * e)
     lv_obj_t * obj = lv_event_get_target(e);
     if(code == LV_EVENT_DRAW_MAIN) {
         /*Draw the selected rectangle*/
-        const lv_area_t * clip_area = lv_event_get_param(e);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
         lv_area_t sel_area;
         get_sel_area(obj, &sel_area);
         lv_draw_rect_dsc_t sel_dsc;
         lv_draw_rect_dsc_init(&sel_dsc);
         lv_obj_init_draw_rect_dsc(obj, LV_PART_SELECTED, &sel_dsc);
-        lv_draw_rect(&sel_area, clip_area, &sel_dsc);
+        lv_draw_rect(draw_ctx, &sel_dsc, &sel_area);
     }
     /*Post draw when the children are drawn*/
     else if(code == LV_EVENT_DRAW_POST) {
-        const lv_area_t * clip_area = lv_event_get_param(e);
+        lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
         lv_draw_label_dsc_t label_dsc;
         lv_draw_label_dsc_init(&label_dsc);
@@ -471,7 +471,7 @@ static void draw_main(lv_event_t * e)
         get_sel_area(obj, &sel_area);
         lv_area_t mask_sel;
         bool area_ok;
-        area_ok = _lv_area_intersect(&mask_sel, clip_area, &sel_area);
+        area_ok = _lv_area_intersect(&mask_sel, draw_ctx->clip_area, &sel_area);
         if(area_ok) {
             lv_obj_t * label = get_label(obj);
 
@@ -509,7 +509,10 @@ static void draw_main(lv_event_t * e)
             label_sel_area.y2 = label_sel_area.y1 + res_p.y;
 
             label_dsc.flag |= LV_TEXT_FLAG_EXPAND;
-            lv_draw_label(&label_sel_area, &mask_sel, &label_dsc, lv_label_get_text(label), NULL);
+            const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+            draw_ctx->clip_area = &mask_sel;
+            lv_draw_label(draw_ctx, &label_dsc, &label_sel_area, lv_label_get_text(label), NULL);
+            draw_ctx->clip_area = clip_area_ori;
         }
     }
 }
@@ -523,7 +526,15 @@ static void draw_label(lv_event_t * e)
     lv_draw_label_dsc_t label_draw_dsc;
     lv_draw_label_dsc_init(&label_draw_dsc);
     lv_obj_init_draw_label_dsc(roller, LV_PART_MAIN, &label_draw_dsc);
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
+
+    /*If the roller has shadow or outline it has some ext. draw size
+     *therefore the label can overflow the roller's boundaries.
+     *To solve this limit the clip area to the "plain" roller.*/
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    lv_area_t roller_clip_area;
+    if(!_lv_area_intersect(&roller_clip_area, draw_ctx->clip_area, &roller->coords)) return;
+    draw_ctx->clip_area = &roller_clip_area;
 
     lv_area_t sel_area;
     get_sel_area(roller, &sel_area);
@@ -533,17 +544,25 @@ static void draw_label(lv_event_t * e)
     clip2.y1 = label_obj->coords.y1;
     clip2.x2 = label_obj->coords.x2;
     clip2.y2 = sel_area.y1;
-    if(_lv_area_intersect(&clip2, clip_area, &clip2)) {
-        lv_draw_label(&label_obj->coords, &clip2, &label_draw_dsc, lv_label_get_text(label_obj), NULL);
+    if(_lv_area_intersect(&clip2, draw_ctx->clip_area, &clip2)) {
+        const lv_area_t * clip_area_ori2 = draw_ctx->clip_area;
+        draw_ctx->clip_area = &clip2;
+        lv_draw_label(draw_ctx, &label_draw_dsc, &label_obj->coords, lv_label_get_text(label_obj), NULL);
+        draw_ctx->clip_area = clip_area_ori2;
     }
 
     clip2.x1 = label_obj->coords.x1;
     clip2.y1 = sel_area.y2;
     clip2.x2 = label_obj->coords.x2;
     clip2.y2 = label_obj->coords.y2;
-    if(_lv_area_intersect(&clip2, clip_area, &clip2)) {
-        lv_draw_label(&label_obj->coords, &clip2, &label_draw_dsc, lv_label_get_text(label_obj), NULL);
+    if(_lv_area_intersect(&clip2, draw_ctx->clip_area, &clip2)) {
+        const lv_area_t * clip_area_ori2 = draw_ctx->clip_area;
+        draw_ctx->clip_area = &clip2;
+        lv_draw_label(draw_ctx, &label_draw_dsc, &label_obj->coords, lv_label_get_text(label_obj), NULL);
+        draw_ctx->clip_area = clip_area_ori2;
     }
+
+    draw_ctx->clip_area = clip_area_ori;
 }
 
 static void get_sel_area(lv_obj_t * obj, lv_area_t * sel_area)
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.h
index 1520c4a57..d90001d91 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.h
@@ -53,7 +53,7 @@ extern const lv_obj_class_t lv_roller_class;
  **********************/
 
 /**
- * Create a roller objects
+ * Create a roller object
  * @param parent    pointer to an object, it will be the parent of the new roller.
  * @return          pointer to the created roller
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.c
index 79b43719f..82f6feea3 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.c
@@ -109,13 +109,19 @@ static void lv_slider_event(const lv_obj_class_t * class_p, lv_event_t * e)
     /*Advanced hit testing: react only on dragging the knob(s)*/
     if(code == LV_EVENT_HIT_TEST) {
         lv_hit_test_info_t * info = lv_event_get_param(e);
+        lv_coord_t ext_click_area = obj->spec_attr ? obj->spec_attr->ext_click_pad : 0;
 
         /*Ordinary slider: was the knob area hit?*/
-        info->res = _lv_area_is_point_on(&slider->right_knob_area, info->point, 0);
+        lv_area_t a;
+        lv_area_copy(&a, &slider->right_knob_area);
+        lv_area_increase(&a, ext_click_area, ext_click_area);
+        info->res = _lv_area_is_point_on(&a, info->point, 0);
 
-        /*There's still a change we have a hit, if we have another knob*/
+        /*There's still a chance that there is a hit if there is another knob*/
         if((info->res == false) && (type == LV_SLIDER_MODE_RANGE)) {
-            info->res = _lv_area_is_point_on(&slider->left_knob_area, info->point, 0);
+            lv_area_copy(&a, &slider->left_knob_area);
+            lv_area_increase(&a, ext_click_area, ext_click_area);
+            info->res = _lv_area_is_point_on(&a, info->point, 0);
         }
     }
     else if(code == LV_EVENT_PRESSED) {
@@ -323,7 +329,7 @@ static void draw_knob(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_slider_t * slider = (lv_slider_t *)obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     lv_base_dir_t base_dir = lv_obj_get_style_base_dir(obj, LV_PART_MAIN);
 
     lv_coord_t objw = lv_obj_get_width(obj);
@@ -372,7 +378,7 @@ static void draw_knob(lv_event_t * e)
     lv_area_copy(&slider->right_knob_area, &knob_area);
 
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.part = LV_PART_KNOB;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_SLIDER_DRAW_PART_KNOB;
@@ -382,7 +388,7 @@ static void draw_knob(lv_event_t * e)
 
     if(lv_slider_get_mode(obj) != LV_SLIDER_MODE_RANGE) {
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-        lv_draw_rect(&slider->right_knob_area, clip_area, &knob_rect_dsc);
+        lv_draw_rect(draw_ctx, &knob_rect_dsc, &slider->right_knob_area);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
     else {
@@ -391,7 +397,7 @@ static void draw_knob(lv_event_t * e)
         lv_memcpy(&knob_rect_dsc_tmp, &knob_rect_dsc, sizeof(lv_draw_rect_dsc_t));
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-        lv_draw_rect(&slider->right_knob_area, clip_area, &knob_rect_dsc);
+        lv_draw_rect(draw_ctx, &knob_rect_dsc, &slider->right_knob_area);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
 
         /*Draw a second knob for the start_value side*/
@@ -411,7 +417,7 @@ static void draw_knob(lv_event_t * e)
         part_draw_dsc.id = 1;
 
         lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
-        lv_draw_rect(&slider->left_knob_area, clip_area, &knob_rect_dsc);
+        lv_draw_rect(draw_ctx, &knob_rect_dsc, &slider->left_knob_area);
         lv_event_send(obj, LV_EVENT_DRAW_PART_END, &part_draw_dsc);
     }
 }
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.h
index 28b7543db..386950ce1 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.h
@@ -65,7 +65,7 @@ typedef enum {
  **********************/
 
 /**
- * Create a slider objects
+ * Create a slider object
  * @param parent    pointer to an object, it will be the parent of the new slider.
  * @return          pointer to the created slider
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.c
index 7bc89512c..b32861043 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.c
@@ -127,7 +127,7 @@ static void lv_switch_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
         /*The smaller size is the knob diameter*/
         lv_coord_t knob_size = LV_MAX4(knob_left, knob_right, knob_bottom, knob_top);
-        knob_size += 2;         /*For rounding error*/
+        knob_size += _LV_SWITCH_KNOB_EXT_AREA_CORRECTION;
         knob_size += lv_obj_calculate_ext_draw_size(obj, LV_PART_KNOB);
 
         lv_coord_t * s = lv_event_get_param(e);
@@ -148,8 +148,7 @@ static void draw_main(lv_event_t * e)
     lv_obj_t * obj = lv_event_get_target(e);
     lv_switch_t * sw = (lv_switch_t *)obj;
 
-    const lv_area_t * clip_area = lv_event_get_param(e);
-    lv_base_dir_t base_dir = lv_obj_get_style_base_dir(obj, LV_PART_MAIN);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
 
     /*Calculate the indicator area*/
     lv_coord_t bg_left = lv_obj_get_style_pad_left(obj,     LV_PART_MAIN);
@@ -169,18 +168,12 @@ static void draw_main(lv_event_t * e)
     lv_draw_rect_dsc_t draw_indic_dsc;
     lv_draw_rect_dsc_init(&draw_indic_dsc);
     lv_obj_init_draw_rect_dsc(obj, LV_PART_INDICATOR, &draw_indic_dsc);
-    lv_draw_rect(&indic_area, clip_area, &draw_indic_dsc);
+    lv_draw_rect(draw_ctx, &draw_indic_dsc, &indic_area);
 
     /*Draw the knob*/
-    lv_coord_t objh = lv_obj_get_height(obj);
-    lv_coord_t knob_size = objh;
-    lv_area_t knob_area;
-
-    lv_coord_t anim_length = obj->coords.x2 - bg_right - obj->coords.x1 - bg_left - knob_size;
-
-    lv_coord_t anim_value_x;
-
-    bool chk = lv_obj_get_state(obj) & LV_STATE_CHECKED;
+    lv_coord_t anim_value_x = 0;
+    lv_coord_t knob_size = lv_obj_get_height(obj);
+    lv_coord_t anim_length = lv_area_get_width(&obj->coords) - knob_size;
 
     if(LV_SWITCH_IS_ANIMATING(sw)) {
         /* Use the animation's coordinate */
@@ -188,18 +181,20 @@ static void draw_main(lv_event_t * e)
     }
     else {
         /* Use LV_STATE_CHECKED to decide the coordinate */
+        bool chk = lv_obj_get_state(obj) & LV_STATE_CHECKED;
         anim_value_x = chk ? anim_length : 0;
     }
 
-    if(base_dir == LV_BASE_DIR_RTL) {
+    if(LV_BASE_DIR_RTL == lv_obj_get_style_base_dir(obj, LV_PART_MAIN)) {
         anim_value_x = anim_length - anim_value_x;
     }
 
-    knob_area.x1 = obj->coords.x1 + bg_left + anim_value_x;
+    lv_area_t knob_area;
+    knob_area.x1 = obj->coords.x1 + anim_value_x;
     knob_area.x2 = knob_area.x1 + knob_size;
 
-    knob_area.y1 = obj->coords.y1 + bg_top;
-    knob_area.y2 = obj->coords.y2 - bg_bottom;
+    knob_area.y1 = obj->coords.y1;
+    knob_area.y2 = obj->coords.y2;
 
     lv_coord_t knob_left = lv_obj_get_style_pad_left(obj, LV_PART_KNOB);
     lv_coord_t knob_right = lv_obj_get_style_pad_right(obj, LV_PART_KNOB);
@@ -216,7 +211,7 @@ static void draw_main(lv_event_t * e)
     lv_draw_rect_dsc_init(&knob_rect_dsc);
     lv_obj_init_draw_rect_dsc(obj, LV_PART_KNOB, &knob_rect_dsc);
 
-    lv_draw_rect(&knob_area, clip_area, &knob_rect_dsc);
+    lv_draw_rect(draw_ctx, &knob_rect_dsc, &knob_area);
 }
 
 static void lv_switch_anim_exec_cb(void * var, int32_t value)
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.h
index 7d573f2af..83ca81bc4 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.h
@@ -1,5 +1,5 @@
 /**
- * @file lv_sw.h
+ * @file lv_switch.h
  *
  */
 
@@ -23,6 +23,9 @@ extern "C" {
  *      DEFINES
  *********************/
 
+/** Switch knob extra area correction factor */
+#define _LV_SWITCH_KNOB_EXT_AREA_CORRECTION 2
+
 /**********************
  *      TYPEDEFS
  **********************/
@@ -39,7 +42,7 @@ extern const lv_obj_class_t lv_switch_class;
  **********************/
 
 /**
- * Create a switch objects
+ * Create a switch object
  * @param parent pointer to an object, it will be the parent of the new switch
  * @return pointer to the created switch
  */
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_table.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_table.c
index a07c3249b..1b032156e 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_table.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_table.c
@@ -464,6 +464,7 @@ static void lv_table_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
 
     if(table->cell_data) lv_mem_free(table->cell_data);
     if(table->row_h) lv_mem_free(table->row_h);
+    if(table->col_w) lv_mem_free(table->col_w);
 }
 
 static void lv_table_event(const lv_obj_class_t * class_p, lv_event_t * e)
@@ -589,9 +590,12 @@ static void draw_main(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_table_t * table = (lv_table_t *)obj;
-    const lv_area_t * clip_area_ori = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     lv_area_t clip_area;
-    if(!_lv_area_intersect(&clip_area, &obj->coords, clip_area_ori)) return;
+    if(!_lv_area_intersect(&clip_area, &obj->coords, draw_ctx->clip_area)) return;
+
+    const lv_area_t * clip_area_ori = draw_ctx->clip_area;
+    draw_ctx->clip_area = &clip_area;
 
     lv_point_t txt_size;
     lv_area_t cell_area;
@@ -634,7 +638,7 @@ static void draw_main(lv_event_t * e)
 
     /*Handle custom drawer*/
     lv_obj_draw_part_dsc_t part_draw_dsc;
-    lv_obj_draw_dsc_init(&part_draw_dsc, &clip_area);
+    lv_obj_draw_dsc_init(&part_draw_dsc, draw_ctx);
     part_draw_dsc.part = LV_PART_ITEMS;
     part_draw_dsc.class_p = MY_CLASS;
     part_draw_dsc.type = LV_TABLE_DRAW_PART_CELL;
@@ -647,7 +651,7 @@ static void draw_main(lv_event_t * e)
         cell_area.y1 = cell_area.y2 + 1;
         cell_area.y2 = cell_area.y1 + h_row - 1;
 
-        if(cell_area.y1 > clip_area.y2) return;
+        if(cell_area.y1 > clip_area.y2) break;
 
         if(rtl) cell_area.x1 = obj->coords.x2 - bg_right - 1 - scroll_x - border_width;
         else cell_area.x2 = obj->coords.x1 + bg_left - 1 - scroll_x + border_width;
@@ -734,7 +738,7 @@ static void draw_main(lv_event_t * e)
             part_draw_dsc.id = row * table->col_cnt + col;
             lv_event_send(obj, LV_EVENT_DRAW_PART_BEGIN, &part_draw_dsc);
 
-            lv_draw_rect(&cell_area_border, &clip_area, &rect_dsc_act);
+            lv_draw_rect(draw_ctx, &rect_dsc_act, &cell_area_border);
 
             if(table->cell_data[cell]) {
                 txt_area.x1 = cell_area.x1 + cell_left;
@@ -757,11 +761,13 @@ static void draw_main(lv_event_t * e)
                     txt_area.y2 = cell_area.y1 + h_row / 2 + txt_size.y / 2;
                 }
 
-                lv_area_t label_mask;
+                lv_area_t label_clip_area;
                 bool label_mask_ok;
-                label_mask_ok = _lv_area_intersect(&label_mask, &clip_area, &cell_area);
+                label_mask_ok = _lv_area_intersect(&label_clip_area, &clip_area, &cell_area);
                 if(label_mask_ok) {
-                    lv_draw_label(&txt_area, &label_mask, &label_dsc_act, table->cell_data[cell] + 1, NULL);
+                    draw_ctx->clip_area = &label_clip_area;
+                    lv_draw_label(draw_ctx, &label_dsc_act, &txt_area, table->cell_data[cell] + 1, NULL);
+                    draw_ctx->clip_area = &clip_area;
                 }
             }
 
@@ -771,6 +777,8 @@ static void draw_main(lv_event_t * e)
             col += col_merge;
         }
     }
+
+    draw_ctx->clip_area = clip_area_ori;
 }
 
 static void refr_size(lv_obj_t * obj, uint32_t strat_row)
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.c
index 6be921b50..0dff383d7 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.c
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.c
@@ -809,7 +809,7 @@ static void lv_textarea_constructor(const lv_obj_class_t * class_p, lv_obj_t * o
     ta->accepted_chars    = NULL;
     ta->max_length        = 0;
     ta->cursor.show      = 1;
-    /*It will be set to zero later (with zero value lv_textarea_set_cursor_pos(obj, 0); woldn't do anything as there is no difference)*/
+    /*It will be set to zero later (with zero value lv_textarea_set_cursor_pos(obj, 0); wouldn't do anything as there is no difference)*/
     ta->cursor.pos        = 1;
     ta->cursor.click_pos  = 1;
     ta->cursor.valid_x    = 0;
@@ -1271,7 +1271,7 @@ static void draw_placeholder(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_textarea_t * ta = (lv_textarea_t *)obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     const char * txt = lv_label_get_text(ta->label);
 
     /*Draw the place holder*/
@@ -1288,7 +1288,7 @@ static void draw_placeholder(lv_event_t * e)
         lv_area_t ph_coords;
         lv_area_copy(&ph_coords, &obj->coords);
         lv_area_move(&ph_coords, left + border_width, top + border_width);
-        lv_draw_label(&ph_coords, clip_area, &ph_dsc, ta->placeholder_txt, NULL);
+        lv_draw_label(draw_ctx, &ph_dsc, &ph_coords, ta->placeholder_txt, NULL);
     }
 }
 
@@ -1296,7 +1296,7 @@ static void draw_cursor(lv_event_t * e)
 {
     lv_obj_t * obj = lv_event_get_target(e);
     lv_textarea_t * ta = (lv_textarea_t *)obj;
-    const lv_area_t * clip_area = lv_event_get_param(e);
+    lv_draw_ctx_t * draw_ctx = lv_event_get_draw_ctx(e);
     const char * txt = lv_label_get_text(ta->label);
 
     if(ta->cursor.show == 0) return;
@@ -1315,7 +1315,7 @@ static void draw_cursor(lv_event_t * e)
     cur_area.x2 += ta->label->coords.x1;
     cur_area.y2 += ta->label->coords.y1;
 
-    lv_draw_rect(&cur_area, clip_area, &cur_dsc);
+    lv_draw_rect(draw_ctx, &cur_dsc, &cur_area);
 
     lv_coord_t border_width = lv_obj_get_style_border_width(obj, LV_PART_CURSOR);
     lv_coord_t left = lv_obj_get_style_pad_left(obj, LV_PART_CURSOR) + border_width;
@@ -1334,7 +1334,7 @@ static void draw_cursor(lv_event_t * e)
     lv_draw_label_dsc_init(&cur_label_dsc);
     lv_obj_init_draw_label_dsc(obj, LV_PART_CURSOR, &cur_label_dsc);
     if(cur_dsc.bg_opa > LV_OPA_MIN || cur_label_dsc.color.full != label_color.full) {
-        lv_draw_label(&cur_area, clip_area, &cur_label_dsc, letter_buf, NULL);
+        lv_draw_label(draw_ctx, &cur_label_dsc, &cur_area, letter_buf, NULL);
     }
 }
 
diff --git a/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.h
index 2ab48f0ab..219e2725e 100644
--- a/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.h
+++ b/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.h
@@ -1,5 +1,5 @@
 /**
- * @file lv_ta.h
+ * @file lv_textarea.h
  *
  */
 
@@ -76,7 +76,7 @@ enum {
  **********************/
 
 /**
- * Create a text area objects
+ * Create a text area object
  * @param parent    pointer to an object, it will be the parent of the new text area
  * @return          pointer to the created text area
  */
diff --git a/tasmota/berry/lvgl_examples/lv.be b/tasmota/berry/lvgl_examples/lv.be
new file mode 100644
index 000000000..0809988d5
--- /dev/null
+++ b/tasmota/berry/lvgl_examples/lv.be
@@ -0,0 +1,116 @@
+#- start LVGL and init environment -#
+lv.start()
+
+hres = lv.get_hor_res()       # should be 320
+vres = lv.get_ver_res()       # should be 240
+
+scr = lv.scr_act()            # default screean object
+f20 = lv.montserrat_font(20)  # load embedded Montserrat 20
+
+#- Background with a gradient from black #000000 (bottom) to dark blue #0000A0 (top) -#
+scr.set_style_bg_color(lv.color(0x0000A0), lv.PART_MAIN | lv.STATE_DEFAULT)
+scr.set_style_bg_grad_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT)
+scr.set_style_bg_grad_dir(lv.GRAD_DIR_VER, lv.PART_MAIN | lv.STATE_DEFAULT)
+
+#- Upper state line -#
+stat_line = lv.label(scr)
+if f20 != nil stat_line.set_style_text_font(f20, lv.PART_MAIN | lv.STATE_DEFAULT) end
+stat_line.set_long_mode(lv.LABEL_LONG_SCROLL)                                        # auto scrolling if text does not fit
+stat_line.set_width(hres)
+stat_line.set_align(lv.TEXT_ALIGN_LEFT)                                              # align text left
+stat_line.set_style_bg_color(lv.color(0xD00000), lv.PART_MAIN | lv.STATE_DEFAULT)    # background #000088
+stat_line.set_style_bg_opa(lv.OPA_COVER, lv.PART_MAIN | lv.STATE_DEFAULT)            # 100% background opacity
+stat_line.set_style_text_color(lv.color(0xFFFFFF), lv.PART_MAIN | lv.STATE_DEFAULT)  # text color #FFFFFF
+stat_line.set_text(tasmota.cmd("DeviceName").find('DeviceName',"Tasmota"))
+stat_line.refr_size()                                                                # new in LVGL8
+stat_line.refr_pos()                                                                 # new in LVGL8
+
+#- display wifi strength indicator icon (for professionals ;) -#
+wifi_icon = lv.wifi_arcs_icon(stat_line)    # the widget takes care of positioning and driver stuff
+#wifi_icon = lv.wifi_bars_icon(stat_line)    # the widget takes care of positioning and driver stuff
+clock_icon = lv.clock_icon(stat_line)
+
+#- create a style for the buttons -#
+btn_style = lv.style()
+btn_style.set_radius(10)                        # radius of rounded corners
+btn_style.set_bg_opa(lv.OPA_COVER)              # 100% backgrond opacity
+if f20 != nil btn_style.set_text_font(f20) end  # set font to Montserrat 20
+btn_style.set_bg_color(lv.color(0x1fa3ec))      # background color #1FA3EC (Tasmota Blue)
+btn_style.set_border_color(lv.color(0x0000FF))  # border color #0000FF
+btn_style.set_text_color(lv.color(0xFFFFFF))    # text color white #FFFFFF
+
+#- create buttons -#
+prev_btn = lv.btn(scr)                            # create button with main screen as parent
+prev_btn.set_pos(20,vres-30)                      # position of button
+prev_btn.set_size(80, 25)                         # size of button
+prev_btn.add_style(btn_style, lv.PART_MAIN | lv.STATE_DEFAULT)   # style of button
+prev_label = lv.label(prev_btn)                   # create a label as sub-object
+prev_label.set_text(lv.SYMBOL_LEFT)                          # set label text
+prev_label.center()
+
+next_btn = lv.btn(scr)                            # right button
+next_btn.set_pos(220,vres-30)
+next_btn.set_size(80, 25)
+next_btn.add_style(btn_style, lv.PART_MAIN | lv.STATE_DEFAULT)
+next_label = lv.label(next_btn)
+next_label.set_text(lv.SYMBOL_RIGHT)
+next_label.center()
+
+home_btn = lv.btn(scr)                            # center button
+home_btn.set_pos(120,vres-30)
+home_btn.set_size(80, 25)
+home_btn.add_style(btn_style, lv.PART_MAIN | lv.STATE_DEFAULT)
+home_label = lv.label(home_btn)
+home_label.set_text(lv.SYMBOL_HOME)                 # set text as Home icon
+home_label.center()
+
+#- callback function when a button is pressed, react to EVENT_CLICKED event -#
+
+def btn_clicked_cb(obj, event)
+    var btn = "Unknown"
+    if   obj == prev_btn  btn = "Prev"
+    elif obj == next_btn  btn = "Next"
+    elif obj == home_btn  btn = "Home"
+    end
+    print(btn, "button pressed")
+end
+
+
+prev_btn.add_event_cb(btn_clicked_cb, lv.EVENT_CLICKED, 0)
+next_btn.add_event_cb(btn_clicked_cb, lv.EVENT_CLICKED, 0)
+home_btn.add_event_cb(btn_clicked_cb, lv.EVENT_CLICKED, 0)
+
+
+import lv_wifi_graph
+ws_h = 40
+ws_w = 80
+ws = lv_wifi_graph(scr)
+ws.set_size(ws_w,ws_h)
+ws.set_pos(hres-ws_w, stat_line.get_height())
+tasmota.add_driver(ws)
+
+# info bloc
+import lv_tasmota_info
+var info = lv_tasmota_info(scr)
+info.set_pos(0, stat_line.get_height())
+info.set_size(hres - 80, 30)
+tasmota.add_driver(info)
+
+# logs
+import lv_tasmota_log_roboto
+var lg = lv_tasmota_log_roboto(scr, 6)
+lg.set_size(hres, 90)
+lg.set_pos(0, stat_line.get_height() + 40 - 1)
+tasmota.add_driver(lg)
+
+#-
+sb120 = lv.load_freetype_font("sketchbook.ttf", 120, 0)
+tt = lv.label(scr)
+tt.set_style_bg_opa(lv.OPA_0, lv.PART_MAIN | lv.STATE_DEFAULT)
+tt.set_style_text_color(lv.color(0xFFFFFF), lv.PART_MAIN | lv.STATE_DEFAULT)
+tt.set_text("MQTT")
+tt.set_pos(10,40)
+tt.set_size(300,150)
+if sb120 != nil tt.set_style_text_font(sb120, lv.PART_MAIN | lv.STATE_DEFAULT) end
+
+-#
diff --git a/tasmota/berry/lvgl_examples/lv_tasmota_info.be b/tasmota/berry/lvgl_examples/lv_tasmota_info.be
new file mode 100644
index 000000000..f9ac23c37
--- /dev/null
+++ b/tasmota/berry/lvgl_examples/lv_tasmota_info.be
@@ -0,0 +1,66 @@
+# lv_tasmota_info class
+
+class lv_tasmota_info : lv.label
+  var msg
+  var delay
+
+  def init(parent)
+    super(self).init(parent)
+    self.set_width(parent.get_width())
+    self.set_pos(0, 0)
+
+    # self.set_style_bg_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_bg_opa(0, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.move_background()
+    # self.set_style_border_opa(255, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_radius(0, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_pad_all(2, lv.PART_MAIN | lv.STATE_DEFAULT)
+    # self.set_style_border_color(lv.color(0x0099EE), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_width(0, lv.PART_MAIN | lv.STATE_DEFAULT)
+
+    self.set_style_text_color(lv.color(0xFFFFFF), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_long_mode(lv.LABEL_LONG_CLIP)
+    # var roboto12 = lv.font_robotocondensed_latin1(12)
+    # self.set_style_text_font(roboto12, lv.PART_MAIN | lv.STATE_DEFAULT)
+    var lg_font = lv.font_montserrat(14)
+    self.set_style_text_font(lg_font, lv.PART_MAIN | lv.STATE_DEFAULT)
+
+    self.msg = "IP: - \nFree: - kB"
+    self.set_text(self.msg)
+    self.delay = 1
+  end
+
+  def update()
+    var wifi_ip = "IP:  " + tasmota.wifi().find('ip', '') + "   " + tasmota.eth().find('ip', '')
+    var tas_mem = tasmota.memory()
+    var mem_msg = "Free:  " + str(tas_mem['heap_free']) + " kB"
+    if tas_mem.contains('psram_free')
+      mem_msg += "  |  PSRam:  " + str(tas_mem['psram_free']) + " kB"
+    end
+    var msg = wifi_ip + "\n" + mem_msg
+
+    if msg != self.msg
+      self.msg = msg
+      self.set_text(self.msg)
+    end
+  end
+
+  def every_second()
+    self.delay -= 1
+    if self.delay == 0
+      self.update()
+      self.delay = 1
+    end
+  end
+
+end
+
+return lv_tasmota_info
+
+#-
+import lv_tasmota_info
+var info = lv_tasmota_info(scr)
+info.set_pos(0, stat_line.get_height())
+info.set_size(hres - 80, 30)
+tasmota.add_driver(info)
+-#
\ No newline at end of file
diff --git a/tasmota/berry/lvgl_examples/lv_tasmota_log.be b/tasmota/berry/lvgl_examples/lv_tasmota_log.be
new file mode 100644
index 000000000..40261a99b
--- /dev/null
+++ b/tasmota/berry/lvgl_examples/lv_tasmota_log.be
@@ -0,0 +1,64 @@
+# lv_tasmota_log class
+
+class lv_tasmota_log : lv.label
+  var lines
+  var line_len
+  var log_reader
+  var log_level
+
+  def init(parent, line_len)
+    super(self).init(parent)
+    self.set_width(parent.get_width())
+    self.set_pos(0, 0)
+
+    self.set_style_bg_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_bg_opa(255, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.move_background()
+    self.set_style_border_opa(255, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_radius(0, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_pad_all(2, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_color(lv.color(0x0099EE), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_width(1, lv.PART_MAIN | lv.STATE_DEFAULT)
+
+    self.set_style_text_color(lv.color(0x00FF00), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_long_mode(lv.LABEL_LONG_CLIP)
+    var lg_font = lv.font_montserrat(10)
+    self.set_style_text_font(lg_font, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_text("")
+
+  	self.line_len = line_len
+  	self.log_reader = tasmota_log_reader()
+  	self.log_level = 2
+
+    # fill with empty strings
+  	self.lines = []
+  	for i:1..line_len
+      self.lines.push("")
+    end
+  end
+
+  def every_second()
+    var dirty = false
+  	for n:0..20
+  	  var line = self.log_reader.get_log(self.log_level)
+  	  if line == nil break end  # no more logs
+  	  self.lines.remove(0)            # remove first line
+  	  self.lines.push(line)
+  	  dirty = true
+  	end
+  	if dirty self.update() end
+  end
+
+  def update()
+    var msg = self.lines.concat("\n")
+    self.set_text(msg)
+  end
+end
+
+return lv_tasmota_log
+
+# import lv_tasmota_log
+# var lg = lv_tasmota_log(scr, 8)
+# lg.set_size(hres, 95)
+# lg.set_pos(0, stat_line.get_height() + 40)
+# tasmota.add_driver(lg)
diff --git a/tasmota/berry/lvgl_examples/lv_tasmota_log_roboto.be b/tasmota/berry/lvgl_examples/lv_tasmota_log_roboto.be
new file mode 100644
index 000000000..c002d9b5a
--- /dev/null
+++ b/tasmota/berry/lvgl_examples/lv_tasmota_log_roboto.be
@@ -0,0 +1,68 @@
+# lv_tasmota_log class
+
+class lv_tasmota_log_roboto : lv.label
+  var lines
+  var line_len
+  var log_reader
+  var log_level
+
+  def init(parent, line_len)
+    super(self).init(parent)
+    self.set_width(parent.get_width())
+    self.set_pos(0, 0)
+
+    self.set_style_bg_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_bg_opa(255, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.move_background()
+    self.set_style_border_opa(255, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_radius(0, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_pad_all(2, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_color(lv.color(0x0099EE), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_width(1, lv.PART_MAIN | lv.STATE_DEFAULT)
+
+    self.set_style_text_color(lv.color(0x00FF00), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_long_mode(lv.LABEL_LONG_CLIP)
+    var roboto12 = lv.font_robotocondensed_latin1(12)
+    self.set_style_text_font(roboto12, lv.PART_MAIN | lv.STATE_DEFAULT)
+    # var lg_font = lv.font_montserrat(10)
+    # self.set_style_text_font(lg_font, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_text("")
+
+  	self.line_len = line_len
+  	self.log_reader = tasmota_log_reader()
+  	self.log_level = 2
+
+    # fill with empty strings
+  	self.lines = []
+  	for i:1..line_len
+      self.lines.push("")
+    end
+  end
+
+  def every_second()
+    var dirty = false
+  	for n:0..20
+  	  var line = self.log_reader.get_log(self.log_level)
+  	  if line == nil break end  # no more logs
+  	  self.lines.remove(0)            # remove first line
+  	  self.lines.push(line)
+  	  dirty = true
+  	end
+  	if dirty self.update() end
+  end
+
+  def update()
+    var msg = self.lines.concat("\n")
+    self.set_text(msg)
+  end
+end
+
+return lv_tasmota_log_roboto
+
+# import lv_tasmota_log
+# var lg = lv_tasmota_log(scr, 6)
+# lg.set_size(hres, 95)
+# lg.set_pos(0, stat_line.get_height() + 40)
+# tasmota.add_driver(lg)
+
+# var roboto12 = lv.font_robotocondensed_latin1(12) lg.set_style_text_font(roboto12, lv.PART_MAIN | lv.STATE_DEFAULT)
\ No newline at end of file
diff --git a/tasmota/berry/lvgl_examples/lv_wifi_graph.be b/tasmota/berry/lvgl_examples/lv_wifi_graph.be
new file mode 100644
index 000000000..f522da5d1
--- /dev/null
+++ b/tasmota/berry/lvgl_examples/lv_wifi_graph.be
@@ -0,0 +1,70 @@
+# lv_wifi_graph class
+
+class lv_wifi_graph : lv.chart
+  var ws_h
+  var ws_w
+  var ser1
+  var wsl
+  var delay
+
+  def init(parent)
+    super(self).init(parent)
+    
+    self.set_style_bg_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_bg_opa(100, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_color(lv.color(0x0099EE), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_border_width(1, lv.PART_MAIN | lv.STATE_DEFAULT)
+    #self.set_style_border_opa(200, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_radius(0, lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.set_style_pad_all(2, lv.PART_MAIN | lv.STATE_DEFAULT)
+
+    self.set_range(lv.CHART_AXIS_PRIMARY_Y, 0, 100)
+    self.set_div_line_count(0,0)		# no lines
+    self.set_type(lv.CHART_TYPE_LINE)
+    
+    self.set_style_size(0, lv.PART_INDICATOR) # don't show dots
+    self.set_style_line_rounded(true, lv.PART_ITEMS)
+    self.set_style_line_width(2, lv.PART_ITEMS) # don't show dots
+    self.set_update_mode(lv.CHART_UPDATE_MODE_SHIFT)
+    
+    self.set_point_count(40)
+
+    self.ser1 = self.add_series(lv.color(0xEE4444), lv.CHART_AXIS_PRIMARY_Y)
+
+    self.wsl = lv.label(self)
+    self.wsl.set_style_text_color(lv.color(0xFFFFFF), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.wsl.set_text("wifi")
+    self.wsl.set_style_text_font(lv.font_montserrat(10), lv.PART_MAIN | lv.STATE_DEFAULT)
+    self.wsl.set_align(lv.ALIGN_BOTTOM_MID)
+
+    self.delay = 1
+  end
+
+  def add_wifi_point()
+    var wifi = tasmota.wifi()
+    var quality = wifi.find("quality")
+    if quality != nil
+      self.set_next_value(self.ser1, quality)
+    end
+  end
+
+  def every_second()
+    self.delay -= 1
+    if self.delay == 0
+      self.add_wifi_point()
+      self.delay = 2
+    end
+  end
+end
+
+return lv_wifi_graph
+
+#-
+import lv_wifi_graph
+ws_h = 40
+ws_w = 80
+ws = lv_wifi_graph(scr)
+ws.set_size(ws_w,ws_h)
+ws.set_pos(hres-ws_w, stat_line.get_height())
+tasmota.add_driver(ws)
+-#
diff --git a/tasmota/lvgl_berry/tasmota_lv_conf.h b/tasmota/lvgl_berry/tasmota_lv_conf.h
index 92640e85c..36aeeca37 100644
--- a/tasmota/lvgl_berry/tasmota_lv_conf.h
+++ b/tasmota/lvgl_berry/tasmota_lv_conf.h
@@ -1,82 +1,99 @@
 /**
  * @file lv_conf.h
- * Configuration file for v8.0.2
+ * Configuration file for v8.2.0
  */
 
 /*
- * COPY THIS FILE AS `lv_conf.h` NEXT TO the `lvgl` FOLDER
+ * Copy this file as `lv_conf.h`
+ * 1. simply next to the `lvgl` folder
+ * 2. or any other places and
+ *    - define `LV_CONF_INCLUDE_SIMPLE`
+ *    - add the path as include path
  */
 
+/* clang-format off */
 #if 1 /*Set it to "1" to enable content*/
 
 #ifndef LV_CONF_H
 #define LV_CONF_H
-/*clang-format off*/
 
 #include <stdint.h>
 
-
 /*====================
    COLOR SETTINGS
  *====================*/
 
 /*Color depth: 1 (1 byte per pixel), 8 (RGB332), 16 (RGB565), 32 (ARGB8888)*/
-#define LV_COLOR_DEPTH     16
+#define LV_COLOR_DEPTH 16
 
-/*Swap the 2 bytes of RGB565 color. Useful if the display has a 8 bit interface (e.g. SPI)*/
-#define LV_COLOR_16_SWAP   1
+/*Swap the 2 bytes of RGB565 color. Useful if the display has an 8-bit interface (e.g. SPI)*/
+#define LV_COLOR_16_SWAP 1
 
 /*Enable more complex drawing routines to manage screens transparency.
  *Can be used if the UI is above another layer, e.g. an OSD menu or video player.
  *Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to non LV_OPA_COVER value*/
-#define LV_COLOR_SCREEN_TRANSP    0
+#define LV_COLOR_SCREEN_TRANSP 0
 
-/*Images pixels with this color will not be drawn if they are  chroma keyed)*/
-#define LV_COLOR_CHROMA_KEY    lv_color_hex(0x00ff00)         /*pure green*/
+/* Adjust color mix functions rounding. GPUs might calculate color mix (blending) differently.
+ * 0: round down, 64: round up from x.75, 128: round up from half, 192: round up from x.25, 254: round up */
+#define LV_COLOR_MIX_ROUND_OFS (LV_COLOR_DEPTH == 32 ? 0: 128)
+
+/*Images pixels with this color will not be drawn if they are chroma keyed)*/
+#define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00)         /*pure green*/
 
 /*=========================
    MEMORY SETTINGS
  *=========================*/
 
 /*1: use custom malloc/free, 0: use the built-in `lv_mem_alloc()` and `lv_mem_free()`*/
-#define LV_MEM_CUSTOM      1
+#define LV_MEM_CUSTOM 1
 #if LV_MEM_CUSTOM == 0
-/*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/
-#  define LV_MEM_SIZE    (32U * 1024U)          /*[bytes]*/
+    /*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/
+    #define LV_MEM_SIZE (48U * 1024U)          /*[bytes]*/
+
+    /*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/
+    #define LV_MEM_ADR 0     /*0: unused*/
+    /*Instead of an address give a memory allocator that will be called to get a memory pool for LVGL. E.g. my_malloc*/
+    #if LV_MEM_ADR == 0
+        //#define LV_MEM_POOL_INCLUDE your_alloc_library  /* Uncomment if using an external allocator*/
+        //#define LV_MEM_POOL_ALLOC   your_alloc          /* Uncomment if using an external allocator*/
+    #endif
 
-/*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/
-#  define LV_MEM_ADR          0     /*0: unused*/
 #else       /*LV_MEM_CUSTOM*/
-#  define LV_MEM_CUSTOM_INCLUDE <tasmota_lv_stdlib.h>   /*Header for the dynamic memory function*/
-#  define LV_MEM_CUSTOM_ALLOC     lvbe_malloc
-#  define LV_MEM_CUSTOM_FREE      lvbe_free
-#  define LV_MEM_CUSTOM_REALLOC   lvbe_realloc
+    #define LV_MEM_CUSTOM_INCLUDE <tasmota_lv_stdlib.h>   /*Header for the dynamic memory function*/
+    #define LV_MEM_CUSTOM_ALLOC     lvbe_malloc
+    #define LV_MEM_CUSTOM_FREE      lvbe_free
+    #define LV_MEM_CUSTOM_REALLOC   lvbe_realloc
 #endif     /*LV_MEM_CUSTOM*/
 
+/*Number of the intermediate memory buffer used during rendering and other internal processing mechanisms.
+ *You will see an error log message if there wasn't enough buffers. */
+#define LV_MEM_BUF_MAX_NUM 16
+
 /*Use the standard `memcpy` and `memset` instead of LVGL's own functions. (Might or might not be faster).*/
-#define LV_MEMCPY_MEMSET_STD    0
+#define LV_MEMCPY_MEMSET_STD 0
 
 /*====================
    HAL SETTINGS
  *====================*/
 
-/*Default display refresh period. LVG will redraw changed ares with this period time*/
-#define LV_DISP_DEF_REFR_PERIOD     30      /*[ms]*/
+/*Default display refresh period. LVG will redraw changed areas with this period time*/
+#define LV_DISP_DEF_REFR_PERIOD 30      /*[ms]*/
 
 /*Input device read period in milliseconds*/
-#define LV_INDEV_DEF_READ_PERIOD    30      /*[ms]*/
+#define LV_INDEV_DEF_READ_PERIOD 30     /*[ms]*/
 
 /*Use a custom tick source that tells the elapsed time in milliseconds.
  *It removes the need to manually update the tick with `lv_tick_inc()`)*/
-#define LV_TICK_CUSTOM     0
+#define LV_TICK_CUSTOM 0
 #if LV_TICK_CUSTOM
-#define LV_TICK_CUSTOM_INCLUDE  "Arduino.h"         /*Header for the system time function*/
-#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis())     /*Expression evaluating to current system time in ms*/
+    #define LV_TICK_CUSTOM_INCLUDE "Arduino.h"         /*Header for the system time function*/
+    #define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis())    /*Expression evaluating to current system time in ms*/
 #endif   /*LV_TICK_CUSTOM*/
 
 /*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings.
  *(Not so important, you can adjust it to modify default sizes and spaces)*/
-#define LV_DPI_DEF                  130     /*[px/inch]*/
+#define LV_DPI_DEF 130     /*[px/inch]*/
 
 /*=======================
  * FEATURE CONFIGURATION
@@ -91,10 +108,16 @@
 #define LV_DRAW_COMPLEX 1
 #if LV_DRAW_COMPLEX != 0
 
-/*Allow buffering some shadow calculation.
- *LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius`
- *Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/
-#define LV_SHADOW_CACHE_SIZE    0
+    /*Allow buffering some shadow calculation.
+    *LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer, where shadow size is `shadow_width + radius`
+    *Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/
+    #define LV_SHADOW_CACHE_SIZE 0
+
+    /* Set number of maximally cached circle data.
+    * The circumference of 1/4 circle are saved for anti-aliasing
+    * radius * 4 bytes are used per circle (the most often used radiuses are saved)
+    * 0: to disable caching */
+    #define LV_CIRCLE_CACHE_SIZE 4
 #endif /*LV_DRAW_COMPLEX*/
 
 /*Default image cache size. Image caching keeps the images opened.
@@ -102,67 +125,101 @@
  *With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images.
  *However the opened images might consume additional RAM.
  *0: to disable caching*/
-#define LV_IMG_CACHE_DEF_SIZE       1
+#define LV_IMG_CACHE_DEF_SIZE   1
 #define LV_IMG_CACHE_DEF_SIZE_PSRAM 20    // special Tasmota setting when PSRAM is used
 
-/*Maximum buffer size to allocate for rotation. Only used if software rotation is enabled in the display driver.*/
-#define LV_DISP_ROT_MAX_BUF         (10*1024)
+/*Number of stops allowed per gradient. Increase this to allow more stops.
+ *This adds (sizeof(lv_color_t) + 1) bytes per additional stop*/
+#define LV_GRADIENT_MAX_STOPS       2
+
+/*Default gradient buffer size.
+ *When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again.
+ *LV_GRAD_CACHE_DEF_SIZE sets the size of this cache in bytes.
+ *If the cache is too small the map will be allocated only while it's required for the drawing.
+ *0 mean no caching.*/
+#define LV_GRAD_CACHE_DEF_SIZE      0
+
+/*Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display)
+ *LV_DITHER_GRADIENT implies allocating one or two more lines of the object's rendering surface
+ *The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */
+#define LV_DITHER_GRADIENT      0
+#if LV_DITHER_GRADIENT
+    /*Add support for error diffusion dithering.
+     *Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing.
+     *The increase in memory consumption is (24 bits * object's width)*/
+    #define LV_DITHER_ERROR_DIFFUSION   0
+#endif
+
+/*Maximum buffer size to allocate for rotation.
+ *Only used if software rotation is enabled in the display driver.*/
+#define LV_DISP_ROT_MAX_BUF (10*1024)
+
 /*-------------
  * GPU
  *-----------*/
 
 /*Use STM32's DMA2D (aka Chrom Art) GPU*/
-#define LV_USE_GPU_STM32_DMA2D  0
+#define LV_USE_GPU_STM32_DMA2D 0
 #if LV_USE_GPU_STM32_DMA2D
-/*Must be defined to include path of CMSIS header of target processor
-e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
-#define LV_GPU_DMA2D_CMSIS_INCLUDE
+    /*Must be defined to include path of CMSIS header of target processor
+    e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
+    #define LV_GPU_DMA2D_CMSIS_INCLUDE
 #endif
 
 /*Use NXP's PXP GPU iMX RTxxx platforms*/
-#define LV_USE_GPU_NXP_PXP      0
+#define LV_USE_GPU_NXP_PXP 0
 #if LV_USE_GPU_NXP_PXP
-/*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c)
- *   and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS
- *   has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected.
- *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init()
- */
-#define LV_USE_GPU_NXP_PXP_AUTO_INIT 0
+    /*1: Add default bare metal and FreeRTOS interrupt handling routines for PXP (lv_gpu_nxp_pxp_osa.c)
+    *   and call lv_gpu_nxp_pxp_init() automatically during lv_init(). Note that symbol SDK_OS_FREE_RTOS
+    *   has to be defined in order to use FreeRTOS OSA, otherwise bare-metal implementation is selected.
+    *0: lv_gpu_nxp_pxp_init() has to be called manually before lv_init()
+    */
+    #define LV_USE_GPU_NXP_PXP_AUTO_INIT 0
 #endif
 
 /*Use NXP's VG-Lite GPU iMX RTxxx platforms*/
-#define LV_USE_GPU_NXP_VG_LITE   0
+#define LV_USE_GPU_NXP_VG_LITE 0
+
+/*Use SDL renderer API*/
+#define LV_USE_GPU_SDL 0
+#if LV_USE_GPU_SDL
+    #define LV_GPU_SDL_INCLUDE_PATH <SDL2/SDL.h>
+    /*Texture cache size, 8MB by default*/
+    #define LV_GPU_SDL_LRU_SIZE (1024 * 1024 * 8)
+    /*Custom blend mode for mask drawing, disable if you need to link with older SDL2 lib*/
+    #define LV_GPU_SDL_CUSTOM_BLEND_MODE (SDL_VERSION_ATLEAST(2, 0, 6))
+#endif
 
 /*-------------
  * Logging
  *-----------*/
 
 /*Enable the log module*/
-#define LV_USE_LOG      0
+#define LV_USE_LOG 0
 #if LV_USE_LOG
 
-/*How important log should be added:
- *LV_LOG_LEVEL_TRACE       A lot of logs to give detailed information
- *LV_LOG_LEVEL_INFO        Log important events
- *LV_LOG_LEVEL_WARN        Log if something unwanted happened but didn't cause a problem
- *LV_LOG_LEVEL_ERROR       Only critical issue, when the system may fail
- *LV_LOG_LEVEL_USER        Only logs added by the user
- *LV_LOG_LEVEL_NONE        Do not log anything*/
-#  define LV_LOG_LEVEL    LV_LOG_LEVEL_WARN
+    /*How important log should be added:
+    *LV_LOG_LEVEL_TRACE       A lot of logs to give detailed information
+    *LV_LOG_LEVEL_INFO        Log important events
+    *LV_LOG_LEVEL_WARN        Log if something unwanted happened but didn't cause a problem
+    *LV_LOG_LEVEL_ERROR       Only critical issue, when the system may fail
+    *LV_LOG_LEVEL_USER        Only logs added by the user
+    *LV_LOG_LEVEL_NONE        Do not log anything*/
+    #define LV_LOG_LEVEL LV_LOG_LEVEL_WARN
 
-/*1: Print the log with 'printf';
- *0: User need to register a callback with `lv_log_register_print_cb()`*/
-#  define LV_LOG_PRINTF   0
+    /*1: Print the log with 'printf';
+    *0: User need to register a callback with `lv_log_register_print_cb()`*/
+    #define LV_LOG_PRINTF 0
 
-/*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/
-#  define LV_LOG_TRACE_MEM            1
-#  define LV_LOG_TRACE_TIMER          1
-#  define LV_LOG_TRACE_INDEV          1
-#  define LV_LOG_TRACE_DISP_REFR      1
-#  define LV_LOG_TRACE_EVENT          1
-#  define LV_LOG_TRACE_OBJ_CREATE     1
-#  define LV_LOG_TRACE_LAYOUT         1
-#  define LV_LOG_TRACE_ANIM           1
+    /*Enable/disable LV_LOG_TRACE in modules that produces a huge number of logs*/
+    #define LV_LOG_TRACE_MEM        1
+    #define LV_LOG_TRACE_TIMER      1
+    #define LV_LOG_TRACE_INDEV      1
+    #define LV_LOG_TRACE_DISP_REFR  1
+    #define LV_LOG_TRACE_EVENT      1
+    #define LV_LOG_TRACE_OBJ_CREATE 1
+    #define LV_LOG_TRACE_LAYOUT     1
+    #define LV_LOG_TRACE_ANIM       1
 
 #endif  /*LV_USE_LOG*/
 
@@ -179,40 +236,46 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_USE_ASSERT_OBJ           0   /*Check the object's type and existence (e.g. not deleted). (Slow)*/
 
 /*Add a custom handler when assert happens e.g. to restart the MCU*/
-#define LV_ASSERT_HANDLER_INCLUDE   <stdint.h>
-#define LV_ASSERT_HANDLER   while(1);   /*Halt by default*/
+#define LV_ASSERT_HANDLER_INCLUDE <stdint.h>
+#define LV_ASSERT_HANDLER while(1);   /*Halt by default*/
 
 /*-------------
  * Others
  *-----------*/
 
-/*1: Show CPU usage and FPS count in the right bottom corner*/
-#define LV_USE_PERF_MONITOR     0
+/*1: Show CPU usage and FPS count*/
+#define LV_USE_PERF_MONITOR 0
+#if LV_USE_PERF_MONITOR
+    #define LV_USE_PERF_MONITOR_POS LV_ALIGN_BOTTOM_RIGHT
+#endif
 
-/*1: Show the used memory and the memory fragmentation  in the left bottom corner
+/*1: Show the used memory and the memory fragmentation
  * Requires LV_MEM_CUSTOM = 0*/
-#define LV_USE_MEM_MONITOR      0
+#define LV_USE_MEM_MONITOR 0
+#if LV_USE_MEM_MONITOR
+    #define LV_USE_MEM_MONITOR_POS LV_ALIGN_BOTTOM_LEFT
+#endif
 
 /*1: Draw random colored rectangles over the redrawn areas*/
-#define LV_USE_REFR_DEBUG       0
+#define LV_USE_REFR_DEBUG 0
 
 /*Change the built in (v)snprintf functions*/
-#define LV_SPRINTF_CUSTOM   0
+#define LV_SPRINTF_CUSTOM 0
 #if LV_SPRINTF_CUSTOM
-#  define LV_SPRINTF_INCLUDE <stdio.h>
-#  define lv_snprintf     snprintf
-#  define lv_vsnprintf    vsnprintf
+    #define LV_SPRINTF_INCLUDE <stdio.h>
+    #define lv_snprintf  snprintf
+    #define lv_vsnprintf vsnprintf
 #else   /*LV_SPRINTF_CUSTOM*/
-#  define LV_SPRINTF_USE_FLOAT 0
+    #define LV_SPRINTF_USE_FLOAT 0
 #endif  /*LV_SPRINTF_CUSTOM*/
 
-#define LV_USE_USER_DATA      1
+#define LV_USE_USER_DATA 1
 
 /*Garbage Collector settings
- *Used if lvgl is binded to higher level language and the memory is managed by that language*/
+ *Used if lvgl is bound to higher level language and the memory is managed by that language*/
 #define LV_ENABLE_GC 0
 #if LV_ENABLE_GC != 0
-#  define LV_GC_INCLUDE "gc.h"                           /*Include Garbage Collector related things*/
+    #define LV_GC_INCLUDE "gc.h"                           /*Include Garbage Collector related things*/
 #endif /*LV_ENABLE_GC*/
 
 /*=====================
@@ -220,7 +283,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  *====================*/
 
 /*For big endian systems set to 1*/
-#define LV_BIG_ENDIAN_SYSTEM    0
+#define LV_BIG_ENDIAN_SYSTEM 0
 
 /*Define a custom attribute to `lv_tick_inc` function*/
 #define LV_ATTRIBUTE_TICK_INC
@@ -232,7 +295,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_ATTRIBUTE_FLUSH_READY
 
 /*Required alignment size for buffers*/
-#define LV_ATTRIBUTE_MEM_ALIGN_SIZE
+#define LV_ATTRIBUTE_MEM_ALIGN_SIZE 1
 
 /*Will be added where memories needs to be aligned (with -Os data might not be aligned to boundary by default).
  * E.g. __attribute__((aligned(4)))*/
@@ -241,7 +304,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Attribute to mark large constant arrays for example font's bitmaps*/
 #define LV_ATTRIBUTE_LARGE_CONST
 
-/*Complier prefix for a big array declaration in RAM*/
+/*Compiler prefix for a big array declaration in RAM*/
 #define LV_ATTRIBUTE_LARGE_RAM_ARRAY
 
 /*Place performance critical functions into a faster memory (e.g RAM)*/
@@ -255,7 +318,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning /*The default value just prevents GCC warning*/
 
 /*Extend the default -32k..32k coordinate range to -4M..4M by using int32_t for coordinates instead of int16_t*/
-#define LV_USE_LARGE_COORD  0
+#define LV_USE_LARGE_COORD 0
 
 /*==================
  *   FONT USAGE
@@ -263,37 +326,37 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 
 /*Montserrat fonts with ASCII range and some symbols using bpp = 4
  *https://fonts.google.com/specimen/Montserrat*/
-#define LV_FONT_MONTSERRAT_8     0
-#define LV_FONT_MONTSERRAT_10    1
-#define LV_FONT_MONTSERRAT_12    0
-#define LV_FONT_MONTSERRAT_14    1
-#define LV_FONT_MONTSERRAT_16    0
-#define LV_FONT_MONTSERRAT_18    0
-#define LV_FONT_MONTSERRAT_20    1
-#define LV_FONT_MONTSERRAT_22    0
-#define LV_FONT_MONTSERRAT_24    0
-#define LV_FONT_MONTSERRAT_26    0
-#define LV_FONT_MONTSERRAT_28    0
-#define LV_FONT_MONTSERRAT_30    0
-#define LV_FONT_MONTSERRAT_32    0
-#define LV_FONT_MONTSERRAT_34    0
-#define LV_FONT_MONTSERRAT_36    0
-#define LV_FONT_MONTSERRAT_38    0
-#define LV_FONT_MONTSERRAT_40    0
-#define LV_FONT_MONTSERRAT_42    0
-#define LV_FONT_MONTSERRAT_44    0
-#define LV_FONT_MONTSERRAT_46    0
-#define LV_FONT_MONTSERRAT_48    0
+#define LV_FONT_MONTSERRAT_8  0
+#define LV_FONT_MONTSERRAT_10 1
+#define LV_FONT_MONTSERRAT_12 0
+#define LV_FONT_MONTSERRAT_14 1
+#define LV_FONT_MONTSERRAT_16 0
+#define LV_FONT_MONTSERRAT_18 0
+#define LV_FONT_MONTSERRAT_20 1
+#define LV_FONT_MONTSERRAT_22 0
+#define LV_FONT_MONTSERRAT_24 0
+#define LV_FONT_MONTSERRAT_26 0
+#define LV_FONT_MONTSERRAT_28 0
+#define LV_FONT_MONTSERRAT_30 0
+#define LV_FONT_MONTSERRAT_32 0
+#define LV_FONT_MONTSERRAT_34 0
+#define LV_FONT_MONTSERRAT_36 0
+#define LV_FONT_MONTSERRAT_38 0
+#define LV_FONT_MONTSERRAT_40 0
+#define LV_FONT_MONTSERRAT_42 0
+#define LV_FONT_MONTSERRAT_44 0
+#define LV_FONT_MONTSERRAT_46 0
+#define LV_FONT_MONTSERRAT_48 0
 
 /*Demonstrate special features*/
 #define LV_FONT_MONTSERRAT_12_SUBPX      0
 #define LV_FONT_MONTSERRAT_28_COMPRESSED 1  /*bpp = 3*/
-#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0  /*Hebrew, Arabic, Perisan letters and all their forms*/
+#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0  /*Hebrew, Arabic, Persian letters and all their forms*/
 #define LV_FONT_SIMSUN_16_CJK            0  /*1000 most common CJK radicals*/
 
 /*Pixel perfect monospace fonts*/
-#define LV_FONT_UNSCII_8        1
-#define LV_FONT_UNSCII_16       1
+#define LV_FONT_UNSCII_8  1
+#define LV_FONT_UNSCII_16 1
 
 /*Optionally declare custom fonts here.
  *You can use these fonts as default font too and they will be available globally.
@@ -344,16 +407,16 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*Enable handling large font and/or fonts with a lot of characters.
  *The limit depends on the font size, font face and bpp.
  *Compiler error will be triggered if a font needs it.*/
-#define LV_FONT_FMT_TXT_LARGE   0
+#define LV_FONT_FMT_TXT_LARGE 0
 
 /*Enables/disables support for compressed fonts.*/
-#define LV_USE_FONT_COMPRESSED  1
+#define LV_USE_FONT_COMPRESSED 1
 
 /*Enable subpixel rendering*/
-#define LV_USE_FONT_SUBPX       1
+#define LV_USE_FONT_SUBPX 1
 #if LV_USE_FONT_SUBPX
-/*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/
-#define LV_FONT_SUBPX_BGR       0  /*0: RGB; 1:BGR order*/
+    /*Set the pixel order of the display. Physical order of RGB channels. Doesn't matter with "normal" fonts.*/
+    #define LV_FONT_SUBPX_BGR 0  /*0: RGB; 1:BGR order*/
 #endif
 
 /*=================
@@ -368,16 +431,16 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
  */
 #define LV_TXT_ENC LV_TXT_ENC_UTF8
 
- /*Can break (wrap) texts on these chars*/
-#define LV_TXT_BREAK_CHARS                  " ,.;:-_"
+/*Can break (wrap) texts on these chars*/
+#define LV_TXT_BREAK_CHARS " ,.;:-_"
 
 /*If a word is at least this long, will break wherever "prettiest"
  *To disable, set to a value <= 0*/
-#define LV_TXT_LINE_BREAK_LONG_LEN          0
+#define LV_TXT_LINE_BREAK_LONG_LEN 0
 
 /*Minimum number of characters in a long word to put on a line before a break.
  *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/
-#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN  3
+#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3
 
 /*Minimum number of characters in a long word to put on a line after a break.
  *Depends on LV_TXT_LINE_BREAK_LONG_LEN.*/
@@ -387,15 +450,15 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_TXT_COLOR_CMD "#"
 
 /*Support bidirectional texts. Allows mixing Left-to-Right and Right-to-Left texts.
- *The direction will be processed according to the Unicode Bidirectioanl Algorithm:
+ *The direction will be processed according to the Unicode Bidirectional Algorithm:
  *https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
-#define LV_USE_BIDI         0
+#define LV_USE_BIDI 0
 #if LV_USE_BIDI
-/*Set the default direction. Supported values:
- *`LV_BASE_DIR_LTR` Left-to-Right
- *`LV_BASE_DIR_RTL` Right-to-Left
- *`LV_BASE_DIR_AUTO` detect texts base direction*/
-#define LV_BIDI_BASE_DIR_DEF  LV_BASE_DIR_AUTO
+    /*Set the default direction. Supported values:
+    *`LV_BASE_DIR_LTR` Left-to-Right
+    *`LV_BASE_DIR_RTL` Right-to-Left
+    *`LV_BASE_DIR_AUTO` detect texts base direction*/
+    #define LV_BIDI_BASE_DIR_DEF LV_BASE_DIR_AUTO
 #endif
 
 /*Enable Arabic/Persian processing
@@ -408,48 +471,47 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 
 /*Documentation of the widgets: https://docs.lvgl.io/latest/en/html/widgets/index.html*/
 
-#define LV_USE_ARC          1
+#define LV_USE_ARC        1
 
-#define LV_USE_ANIMIMG	    1
+#define LV_USE_ANIMIMG    1
 
-#define LV_USE_BAR          1
+#define LV_USE_BAR        1
 
-#define LV_USE_BTN          1
+#define LV_USE_BTN        1
 
-#define LV_USE_BTNMATRIX    1
+#define LV_USE_BTNMATRIX  1
 
-#define LV_USE_CANVAS       1
+#define LV_USE_CANVAS     1
 
-#define LV_USE_CHECKBOX     1
+#define LV_USE_CHECKBOX   1
 
+#define LV_USE_DROPDOWN   1   /*Requires: lv_label*/
 
-#define LV_USE_DROPDOWN     1   /*Requires: lv_label*/
+#define LV_USE_IMG        1   /*Requires: lv_label*/
 
-#define LV_USE_IMG          1   /*Requires: lv_label*/
-
-#define LV_USE_LABEL        1
+#define LV_USE_LABEL      1
 #if LV_USE_LABEL
-#  define LV_LABEL_TEXT_SELECTION         1   /*Enable selecting text of the label*/
-#  define LV_LABEL_LONG_TXT_HINT    1   /*Store some extra info in labels to speed up drawing of very long texts*/
+    #define LV_LABEL_TEXT_SELECTION 1 /*Enable selecting text of the label*/
+    #define LV_LABEL_LONG_TXT_HINT 1  /*Store some extra info in labels to speed up drawing of very long texts*/
 #endif
 
-#define LV_USE_LINE         1
+#define LV_USE_LINE       1
 
-#define LV_USE_ROLLER       1   /*Requires: lv_label*/
+#define LV_USE_ROLLER     1   /*Requires: lv_label*/
 #if LV_USE_ROLLER
-#  define LV_ROLLER_INF_PAGES       7   /*Number of extra "pages" when the roller is infinite*/
+    #define LV_ROLLER_INF_PAGES 7 /*Number of extra "pages" when the roller is infinite*/
 #endif
 
-#define LV_USE_SLIDER       1   /*Requires: lv_bar*/
+#define LV_USE_SLIDER     1   /*Requires: lv_bar*/
 
-#define LV_USE_SWITCH    1
+#define LV_USE_SWITCH     1
 
-#define LV_USE_TEXTAREA   1     /*Requires: lv_label*/
+#define LV_USE_TEXTAREA   1   /*Requires: lv_label*/
 #if LV_USE_TEXTAREA != 0
-#  define LV_TEXTAREA_DEF_PWD_SHOW_TIME     1500    /*ms*/
+    #define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500    /*ms*/
 #endif
 
-#define LV_USE_TABLE  1
+#define LV_USE_TABLE      1
 
 /*==================
  * EXTRA COMPONENTS
@@ -458,101 +520,124 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*-----------
  * Widgets
  *----------*/
-#define LV_USE_CALENDAR     0
+#define LV_USE_CALENDAR   0
 #if LV_USE_CALENDAR
-# define LV_CALENDAR_WEEK_STARTS_MONDAY 0
-# if LV_CALENDAR_WEEK_STARTS_MONDAY
-#  define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"}
-# else
-#  define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"}
-# endif
+    #define LV_CALENDAR_WEEK_STARTS_MONDAY 0
+    #if LV_CALENDAR_WEEK_STARTS_MONDAY
+        #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"}
+    #else
+        #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"}
+    #endif
 
-# define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March",  "April", "May",  "June", "July", "August", "September", "October", "November", "December"}
-# define LV_USE_CALENDAR_HEADER_ARROW       1
-# define LV_USE_CALENDAR_HEADER_DROPDOWN    1
+    #define LV_CALENDAR_DEFAULT_MONTH_NAMES {"January", "February", "March",  "April", "May",  "June", "July", "August", "September", "October", "November", "December"}
+    #define LV_USE_CALENDAR_HEADER_ARROW 1
+    #define LV_USE_CALENDAR_HEADER_DROPDOWN 1
 #endif  /*LV_USE_CALENDAR*/
 
-#define LV_USE_CHART        1
+#define LV_USE_CHART      1
 
-#define LV_USE_COLORWHEEL   1
+#define LV_USE_COLORWHEEL 1
 
-#define LV_USE_IMGBTN       1
+#define LV_USE_IMGBTN     1
 
-#define LV_USE_KEYBOARD     1
+#define LV_USE_KEYBOARD   1
 
-#define LV_USE_LED          1
+#define LV_USE_LED        1
 
-#define LV_USE_LIST         1
+#define LV_USE_LIST       1
 
-#define LV_USE_METER        1
+#define LV_USE_MENU       1
 
-#define LV_USE_MSGBOX       1
+#define LV_USE_METER      1
 
-#define LV_USE_SPINBOX      1
+#define LV_USE_MSGBOX     1
 
-#define LV_USE_SPINNER      1
+#define LV_USE_SPINBOX    1
 
-#define LV_USE_TABVIEW      1
+#define LV_USE_SPINNER    1
 
-#define LV_USE_TILEVIEW     1
+#define LV_USE_TABVIEW    1
 
-#define LV_USE_WIN          0
+#define LV_USE_TILEVIEW   1
 
-#define LV_USE_SPAN         1
+#define LV_USE_WIN        0
+
+#define LV_USE_SPAN       1
 #if LV_USE_SPAN
-/*A line text can contain maximum num of span descriptor */
-#  define LV_SPAN_SNIPPET_STACK_SIZE   64
+    /*A line text can contain maximum num of span descriptor */
+    #define LV_SPAN_SNIPPET_STACK_SIZE 64
 #endif
 
 /*-----------
  * Themes
  *----------*/
+
 /*A simple, impressive and very complete theme*/
-#define LV_USE_THEME_DEFAULT    1
+#define LV_USE_THEME_DEFAULT 1
 #if LV_USE_THEME_DEFAULT
 
-/*0: Light mode; 1: Dark mode*/
-# define LV_THEME_DEFAULT_DARK     0
+    /*0: Light mode; 1: Dark mode*/
+    #define LV_THEME_DEFAULT_DARK 0
 
-/*1: Enable grow on press*/
-# define LV_THEME_DEFAULT_GROW              1
+    /*1: Enable grow on press*/
+    #define LV_THEME_DEFAULT_GROW 1
 
-/*Default transition time in [ms]*/
-# define LV_THEME_DEFAULT_TRANSITON_TIME    80
+    /*Default transition time in [ms]*/
+    #define LV_THEME_DEFAULT_TRANSITION_TIME 80
 #endif /*LV_USE_THEME_DEFAULT*/
 
-/*An very simple them that is a good starting point for a custom theme*/
- #define LV_USE_THEME_BASIC    1
+/*A very simple theme that is a good starting point for a custom theme*/
+#define LV_USE_THEME_BASIC 1
 
 /*A theme designed for monochrome displays*/
-#define LV_USE_THEME_MONO       1
+#define LV_USE_THEME_MONO 1
 
 /*-----------
  * Layouts
  *----------*/
 
 /*A layout similar to Flexbox in CSS.*/
-#define LV_USE_FLEX     1
+#define LV_USE_FLEX 1
 
 /*A layout similar to Grid in CSS.*/
-#define LV_USE_GRID     1
+#define LV_USE_GRID 1
 
 /*---------------------
  * 3rd party libraries
  *--------------------*/
 
-/*File system interfaces for common APIs
- *To enable set a driver letter for that API*/
-#define LV_USE_FS_STDIO '\0'        /*Uses fopen, fread, etc*/
-//#define LV_FS_STDIO_PATH "/home/john/"    /*Set the working directory. If commented it will be "./" */
+/*File system interfaces for common APIs */
 
-#define LV_USE_FS_POSIX '\0'        /*Uses open, read, etc*/
-//#define LV_FS_POSIX_PATH "/home/john/"    /*Set the working directory. If commented it will be "./" */
+/*API for fopen, fread, etc*/
+#define LV_USE_FS_STDIO 0
+#if LV_USE_FS_STDIO
+    #define LV_FS_STDIO_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_STDIO_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_STDIO_CACHE_SIZE  0   /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
 
-#define LV_USE_FS_WIN32 '\0'        /*Uses CreateFile, ReadFile, etc*/
-//#define LV_FS_WIN32_PATH "C:\\Users\\john\\"    /*Set the working directory. If commented it will be ".\\" */
+/*API for open, read, etc*/
+#define LV_USE_FS_POSIX 0
+#if LV_USE_FS_POSIX
+    #define LV_FS_POSIX_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_POSIX_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_POSIX_CACHE_SIZE  0   /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
 
-#define LV_USE_FS_FATFS '\0'        /*Uses f_open, f_read, etc*/
+/*API for CreateFile, ReadFile, etc*/
+#define LV_USE_FS_WIN32 0
+#if LV_USE_FS_WIN32
+    #define LV_FS_WIN32_LETTER  '\0'    /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_WIN32_PATH ""         /*Set the working directory. File/directory paths will be appended to it.*/
+    #define LV_FS_WIN32_CACHE_SIZE 0    /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
+
+/*API for FATFS (needs to be added separately). Uses f_open, f_read, etc*/
+#define LV_USE_FS_FATFS  0
+#if LV_USE_FS_FATFS
+    #define LV_FS_FATFS_LETTER '\0'     /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
+    #define LV_FS_FATFS_CACHE_SIZE 0    /*>0 to cache this number of bytes in lv_fs_read()*/
+#endif
 
 /*PNG decoder library*/
 #define LV_USE_PNG 1
@@ -568,18 +653,36 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 #define LV_USE_GIF 0
 
 /*QR code library*/
-#define LV_USE_QRCODE 0
+#define LV_USE_QRCODE 1
 
 /*FreeType library*/
 #define LV_USE_FREETYPE 1
 #if LV_USE_FREETYPE
-/*Memory used by FreeType to cache characters [bytes] (-1: no caching)*/
-# define LV_FREETYPE_CACHE_SIZE (16 * 1024)
+    /*Memory used by FreeType to cache characters [bytes] (-1: no caching)*/
+    #define LV_FREETYPE_CACHE_SIZE (16 * 1024)
+    #if LV_FREETYPE_CACHE_SIZE >= 0
+        /* 1: bitmap cache use the sbit cache, 0:bitmap cache use the image cache. */
+        /* sbit cache:it is much more memory efficient for small bitmaps(font size < 256) */
+        /* if font size >= 256, must be configured as image cache */
+        #define LV_FREETYPE_SBIT_CACHE 0
+        /* Maximum number of opened FT_Face/FT_Size objects managed by this cache instance. */
+        /* (0:use system defaults) */
+        #define LV_FREETYPE_CACHE_FT_FACES 0
+        #define LV_FREETYPE_CACHE_FT_SIZES 0
+    #endif
 #endif
 
 /*Rlottie library*/
 #define LV_USE_RLOTTIE 0
 
+/*FFmpeg library for image decoding and playing videos
+ *Supports all major image formats so do not enable other image decoder with it*/
+#define LV_USE_FFMPEG  0
+#if LV_USE_FFMPEG
+    /*Dump input information to stderr*/
+    #define LV_FFMPEG_AV_DUMP_FORMAT 0
+#endif
+
 /*-----------
  * Others
  *----------*/
@@ -587,12 +690,47 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
 /*1: Enable API to take snapshot for object*/
 #define LV_USE_SNAPSHOT 0
 
+/*1: Enable Monkey test*/
+#define LV_USE_MONKEY   0
+
+/*1: Enable grid navigation*/
+#define LV_USE_GRIDNAV  0
+
 /*==================
 * EXAMPLES
 *==================*/
 
 /*Enable the examples to be built with the library*/
-#define LV_BUILD_EXAMPLES   0
+#define LV_BUILD_EXAMPLES 0
+
+/*===================
+ * DEMO USAGE
+ ====================*/
+
+/*Show some widget. It might be required to increase `LV_MEM_SIZE` */
+#define LV_USE_DEMO_WIDGETS        0
+#if LV_USE_DEMO_WIDGETS
+#define LV_DEMO_WIDGETS_SLIDESHOW  0
+#endif
+
+/*Demonstrate the usage of encoder and keyboard*/
+#define LV_USE_DEMO_KEYPAD_AND_ENCODER     0
+
+/*Benchmark your system*/
+#define LV_USE_DEMO_BENCHMARK   0
+
+/*Stress test for LVGL*/
+#define LV_USE_DEMO_STRESS      0
+
+/*Music player demo*/
+#define LV_USE_DEMO_MUSIC       0
+#if LV_USE_DEMO_MUSIC
+# define LV_DEMO_MUSIC_SQUARE       0
+# define LV_DEMO_MUSIC_LANDSCAPE    0
+# define LV_DEMO_MUSIC_ROUND        0
+# define LV_DEMO_MUSIC_LARGE        0
+# define LV_DEMO_MUSIC_AUTO_PLAY    0
+#endif
 
 /*--END OF LV_CONF_H--*/
 
diff --git a/tasmota/xdrv_52_3_berry_lvgl.ino b/tasmota/xdrv_52_3_berry_lvgl.ino
index 0f4ac4262..569b6a998 100644
--- a/tasmota/xdrv_52_3_berry_lvgl.ino
+++ b/tasmota/xdrv_52_3_berry_lvgl.ino
@@ -230,6 +230,17 @@ extern "C" {
     { 0, nullptr}
   };
 
+  // unscii fonts
+  const lv_font_table_t lv_unscii_fonts[] = {
+  #if LV_FONT_UNSCII_8
+    {  8, &lv_font_unscii_8 },
+  #endif
+  #if LV_FONT_UNSCII_16
+    { 16, &lv_font_unscii_16 },
+  #endif
+    { 0, nullptr}
+  };
+
   // Seg7 Font
   const lv_font_table_t lv_seg7_fonts[] = {
     {  8, &seg7_8 },
@@ -292,6 +303,7 @@ extern "C" {
   const lv_font_names_t lv_embedded_fonts[] = {
     { "montserrat", lv_montserrat_fonts },
     { "seg7", lv_seg7_fonts },
+    { "unscii", lv_unscii_fonts},
 #ifdef USE_LVGL_OPENHASP
     { "robotocondensed", lv_robotocondensed_fonts },
 #endif
@@ -347,6 +359,13 @@ extern "C" {
     be_raise(vm, kTypeError, nullptr);
   }
 
+  int lv0_load_font_embedded(bvm *vm) {
+    if ((be_top(vm) >= 2) && (be_isstring(vm, 1)) && (be_isint(vm, 2))) {
+      return lv_load_embedded_font(vm, be_tostring(vm, 1), be_toint(vm, 2));
+    }
+    be_return_nil(vm);
+  }
+
   /*********************************************************************************************\
    * Tasmota Logo
   \*********************************************************************************************/
diff --git a/tasmota/xdrv_52_3_berry_tasmota.ino b/tasmota/xdrv_52_3_berry_tasmota.ino
index c7c13c007..4792eafab 100644
--- a/tasmota/xdrv_52_3_berry_tasmota.ino
+++ b/tasmota/xdrv_52_3_berry_tasmota.ino
@@ -240,17 +240,22 @@ extern "C" {
       be_newobject(vm, "map");
       if (Settings->flag4.network_wifi) {
         int32_t rssi = WiFi.RSSI();
-        be_map_insert_int(vm, "rssi", rssi);
-        be_map_insert_int(vm, "quality", WifiGetRssiAsQuality(rssi));
+        bool show_rssi = false;
 #if LWIP_IPV6
         String ipv6_addr = WifiGetIPv6();
         if (ipv6_addr != "") {
           be_map_insert_str(vm, "ip6", ipv6_addr.c_str());
+          show_rssi = true;
         }
 #endif
         if (static_cast<uint32_t>(WiFi.localIP()) != 0) {
           be_map_insert_str(vm, "mac", WiFi.macAddress().c_str());
           be_map_insert_str(vm, "ip", WiFi.localIP().toString().c_str());
+          show_rssi = true;
+        }
+        if (show_rssi) {
+          be_map_insert_int(vm, "rssi", rssi);
+          be_map_insert_int(vm, "quality", WifiGetRssiAsQuality(rssi));
         }
       }
       be_pop(vm, 1);
@@ -603,6 +608,31 @@ extern "C" {
   }
 }
 
+/*********************************************************************************************\
+ * Tasmota Log Reader
+ *
+\*********************************************************************************************/
+
+uint32_t* tlr_init(void) {
+  uint32_t* idx = new uint32_t();
+  *idx = 0;
+  return idx;
+}
+char* tlr_get_log(uint32_t* idx, int32_t log_level) {
+  // bool GetLog(uint32_t req_loglevel, uint32_t* index_p, char** entry_pp, size_t* len_p) {
+  if (log_level < 0 || log_level > 4) { log_level = 2; }    // default to LOG_LEVEL_INFO
+  char* line;
+  size_t len;
+  if (GetLog(log_level, idx, &line, &len) && len > 0) {
+    char* s = (char*) malloc(len+1);
+    memmove(s, line, len);
+    s[len] = 0;
+    return s;   // caller will free()
+  } else {
+    return NULL;
+  }
+}
+
 /*********************************************************************************************\
  * Logging functions
  *
@@ -625,6 +655,18 @@ void berry_log(const char * berry_buf) {
 const uint16_t LOGSZ = 128;                 // Max number of characters in log line
 
 extern "C" {
+  void serial_debug(const char * berry_buf, ...) {
+    // To save stack space support logging for max text length of 128 characters
+    char log_data[LOGSZ];
+
+    va_list arg;
+    va_start(arg, berry_buf);
+    uint32_t len = ext_vsnprintf_P(log_data, LOGSZ-3, berry_buf, arg);
+    va_end(arg);
+    if (len+3 > LOGSZ) { strcat(log_data, "..."); }  // Actual data is more
+    Serial.printf(log_data);
+  }
+
   void berry_log_C(const char * berry_buf, ...) {
     // To save stack space support logging for max text length of 128 characters
     char log_data[LOGSZ];