diff --git a/lv_core/lv_group.h b/lv_core/lv_group.h
index a28ab0ea74..fbe3e95568 100644
--- a/lv_core/lv_group.h
+++ b/lv_core/lv_group.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_core/lv_obj.h b/lv_core/lv_obj.h
index 98c9625eb0..8616c84153 100644
--- a/lv_core/lv_obj.h
+++ b/lv_core/lv_obj.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_core/lv_vdb.h b/lv_core/lv_vdb.h
index 9aa0087d35..5ca1ccf122 100644
--- a/lv_core/lv_vdb.h
+++ b/lv_core/lv_vdb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h
index 593e3e72a5..7056b02566 100644
--- a/lv_draw/lv_draw.h
+++ b/lv_draw/lv_draw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_draw/lv_draw_arc.c b/lv_draw/lv_draw_arc.c
index 63bb17fa0e..7cb47d135c 100644
--- a/lv_draw/lv_draw_arc.c
+++ b/lv_draw/lv_draw_arc.c
@@ -70,15 +70,11 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, cons
     if(start_angle <= end_angle) deg_test = deg_test_norm;
     else deg_test = deg_test_inv;
 
-    // Good, may not be the fastest
-    // Does not draw overlapping pixels
     if(deg_test(270, start_angle, end_angle))  hor_line(center_x - r_out + 1, center_y, mask, thickness - 1, color, opa);   // Left Middle
     if(deg_test(90, start_angle, end_angle))   hor_line(center_x + r_in, center_y,  mask, thickness - 1, color, opa);       // Right Middle
     if(deg_test(180, start_angle, end_angle))  ver_line(center_x, center_y - r_out + 1,  mask, thickness - 1, color, opa);  // Top Middle
     if(deg_test(0, start_angle, end_angle))    ver_line(center_x, center_y + r_in,  mask, thickness - 1, color, opa);       // Bottom middle
 
-
-    lv_point_t last_corner_out = { -r_out, -r_out};
     uint32_t r_out_sqr = r_out * r_out;
     uint32_t r_in_sqr = r_in * r_in;
     int16_t xi;
@@ -153,7 +149,7 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, cons
 
 
 #if LV_ANTIALIAS
-
+        /*TODO*/
 
 #endif
 
diff --git a/lv_draw/lv_draw_rbasic.h b/lv_draw/lv_draw_rbasic.h
index 7c43b91692..b1d62f3fbc 100644
--- a/lv_draw/lv_draw_rbasic.h
+++ b/lv_draw/lv_draw_rbasic.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h
index b55237997d..b619d928b1 100644
--- a/lv_draw/lv_draw_vbasic.h
+++ b/lv_draw/lv_draw_vbasic.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_10.c b/lv_fonts/lv_font_dejavu_10.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_10.c
rename to lv_fonts/lv_font_dejavu_10.c
index d67400e6b0..958581780c 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_10.c
+++ b/lv_fonts/lv_font_dejavu_10.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_10 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_10_cyrillic.c b/lv_fonts/lv_font_dejavu_10_cyrillic.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_10_cyrillic.c
rename to lv_fonts/lv_font_dejavu_10_cyrillic.c
index 2e76258f74..711408d0d1 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_10_cyrillic.c
+++ b/lv_fonts/lv_font_dejavu_10_cyrillic.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_10_latin_sup.c b/lv_fonts/lv_font_dejavu_10_latin_sup.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_10_latin_sup.c
rename to lv_fonts/lv_font_dejavu_10_latin_sup.c
index e57a147e31..5631710915 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_10_latin_sup.c
+++ b/lv_fonts/lv_font_dejavu_10_latin_sup.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_10_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_20.c b/lv_fonts/lv_font_dejavu_20.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_20.c
rename to lv_fonts/lv_font_dejavu_20.c
index 8c4028d268..63e098d953 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_20.c
+++ b/lv_fonts/lv_font_dejavu_20.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_20 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_20_cyrillic.c b/lv_fonts/lv_font_dejavu_20_cyrillic.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_20_cyrillic.c
rename to lv_fonts/lv_font_dejavu_20_cyrillic.c
index 0006e30e70..106c87a226 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_20_cyrillic.c
+++ b/lv_fonts/lv_font_dejavu_20_cyrillic.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_20_latin_sup.c b/lv_fonts/lv_font_dejavu_20_latin_sup.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_20_latin_sup.c
rename to lv_fonts/lv_font_dejavu_20_latin_sup.c
index 733fadb75f..0d62c8b389 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_20_latin_sup.c
+++ b/lv_fonts/lv_font_dejavu_20_latin_sup.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_20_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_30.c b/lv_fonts/lv_font_dejavu_30.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_30.c
rename to lv_fonts/lv_font_dejavu_30.c
index 310110a9fc..346d34774a 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_30.c
+++ b/lv_fonts/lv_font_dejavu_30.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_30 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_30_cyrillic.c b/lv_fonts/lv_font_dejavu_30_cyrillic.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_30_cyrillic.c
rename to lv_fonts/lv_font_dejavu_30_cyrillic.c
index 616ac9d844..a9e3c8f594 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_30_cyrillic.c
+++ b/lv_fonts/lv_font_dejavu_30_cyrillic.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_30_latin_sup.c b/lv_fonts/lv_font_dejavu_30_latin_sup.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_30_latin_sup.c
rename to lv_fonts/lv_font_dejavu_30_latin_sup.c
index 2e754bcbd4..4ec5b3236d 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_30_latin_sup.c
+++ b/lv_fonts/lv_font_dejavu_30_latin_sup.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_30_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_40.c b/lv_fonts/lv_font_dejavu_40.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_40.c
rename to lv_fonts/lv_font_dejavu_40.c
index 4c9ce1cb26..53fc8b8459 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_40.c
+++ b/lv_fonts/lv_font_dejavu_40.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_40 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_40_cyrillic.c b/lv_fonts/lv_font_dejavu_40_cyrillic.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_40_cyrillic.c
rename to lv_fonts/lv_font_dejavu_40_cyrillic.c
index 1b8b39bf04..0a174300d3 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_40_cyrillic.c
+++ b/lv_fonts/lv_font_dejavu_40_cyrillic.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_dejavu_40_latin_sup.c b/lv_fonts/lv_font_dejavu_40_latin_sup.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_dejavu_40_latin_sup.c
rename to lv_fonts/lv_font_dejavu_40_latin_sup.c
index 3b0332c8aa..bea148ff11 100644
--- a/lv_misc/lv_fonts/lv_font_dejavu_40_latin_sup.c
+++ b/lv_fonts/lv_font_dejavu_40_latin_sup.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_DEJAVU_40_LATIN_SUP != 0    /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_symbol_10.c b/lv_fonts/lv_font_symbol_10.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_symbol_10.c
rename to lv_fonts/lv_font_symbol_10.c
index 074a95328b..959a247921 100644
--- a/lv_misc/lv_fonts/lv_font_symbol_10.c
+++ b/lv_fonts/lv_font_symbol_10.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_10 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_symbol_20.c b/lv_fonts/lv_font_symbol_20.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_symbol_20.c
rename to lv_fonts/lv_font_symbol_20.c
index 700d90815b..f4db8d5a25 100644
--- a/lv_misc/lv_fonts/lv_font_symbol_20.c
+++ b/lv_fonts/lv_font_symbol_20.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_20 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_symbol_30.c b/lv_fonts/lv_font_symbol_30.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_symbol_30.c
rename to lv_fonts/lv_font_symbol_30.c
index 7ba222f64e..ae110cc1d9 100644
--- a/lv_misc/lv_fonts/lv_font_symbol_30.c
+++ b/lv_fonts/lv_font_symbol_30.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_30 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_font_symbol_40.c b/lv_fonts/lv_font_symbol_40.c
similarity index 99%
rename from lv_misc/lv_fonts/lv_font_symbol_40.c
rename to lv_fonts/lv_font_symbol_40.c
index f797672297..f7400a224a 100644
--- a/lv_misc/lv_fonts/lv_font_symbol_40.c
+++ b/lv_fonts/lv_font_symbol_40.c
@@ -1,5 +1,5 @@
 
-#include "../lv_font.h"
+#include "../lv_misc/lv_font.h"
 
 #if USE_LV_FONT_SYMBOL_40 != 0  /*Can be enabled in lv_conf.h*/
 
diff --git a/lv_misc/lv_fonts/lv_fonts.mk b/lv_fonts/lv_fonts.mk
similarity index 81%
rename from lv_misc/lv_fonts/lv_fonts.mk
rename to lv_fonts/lv_fonts.mk
index 936301ab8a..ba59d0f27f 100644
--- a/lv_misc/lv_fonts/lv_fonts.mk
+++ b/lv_fonts/lv_fonts.mk
@@ -15,7 +15,7 @@ CSRCS += lv_font_symbol_20.c
 CSRCS += lv_font_symbol_30.c
 CSRCS += lv_font_symbol_40.c
 
-DEPPATH += --dep-path lvgl/lv_misc/lv_fonts
-VPATH += :lvgl/lv_misc/lv_fonts
+DEPPATH += --dep-path lvgl/lv_fonts
+VPATH += :lvgl/lv_fonts
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_misc/lv_fonts"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_fonts"
diff --git a/lv_hal/lv_hal_tick.c b/lv_hal/lv_hal_tick.c
index c582e1bc24..f02e5d6bbd 100644
--- a/lv_hal/lv_hal_tick.c
+++ b/lv_hal/lv_hal_tick.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_anim.h b/lv_misc/lv_anim.h
index 36c304234c..9c98402b86 100644
--- a/lv_misc/lv_anim.h
+++ b/lv_misc/lv_anim.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h
index fb71c03357..a2611c5955 100644
--- a/lv_misc/lv_color.h
+++ b/lv_misc/lv_color.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_font.h b/lv_misc/lv_font.h
index 6643695380..a7db603e09 100644
--- a/lv_misc/lv_font.h
+++ b/lv_misc/lv_font.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -24,7 +24,7 @@ extern "C" {
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 
 /*********************
  *      DEFINES
@@ -102,6 +102,14 @@ const uint8_t * lv_font_get_bitmap(const lv_font_t * font_p, uint32_t letter);
 uint8_t lv_font_get_width(const lv_font_t * font_p, uint32_t letter);
 
 
+/**
+ * Get the width of the letter without overwriting it with the `monospace` attribute
+ * @param font_p pointer to a font
+ * @param letter an UNICODE character code
+ * @return the width of a letter
+ */
+uint8_t lv_font_get_real_width(const lv_font_t * font_p, uint32_t letter);
+
 /**
  * Get the height of a font
  * @param font_p pointer to a font
diff --git a/lv_misc/lv_log.c b/lv_misc/lv_log.c
index a796af47ac..b920cb57cd 100644
--- a/lv_misc/lv_log.c
+++ b/lv_misc/lv_log.c
@@ -10,7 +10,7 @@
 #if USE_LV_LOG
 
 #if LV_LOG_PRINTF
-#include <string.h>
+#include <stdio.h>
 #endif
 /*********************
  *      DEFINES
diff --git a/lv_misc/lv_mem.h b/lv_misc/lv_mem.h
index bdde8d4bc5..ae224cfbd4 100644
--- a/lv_misc/lv_mem.h
+++ b/lv_misc/lv_mem.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_misc.mk b/lv_misc/lv_misc.mk
index fc07f49afd..e6034070c6 100644
--- a/lv_misc/lv_misc.mk
+++ b/lv_misc/lv_misc.mk
@@ -10,6 +10,7 @@ CSRCS += lv_color.c
 CSRCS += lv_txt.c
 CSRCS += lv_ufs.c
 CSRCS += lv_math.c
+CSRCS += lv_log.c
 
 DEPPATH += --dep-path lvgl/lv_misc
 VPATH += :lvgl/lv_misc
diff --git a/lv_misc/lv_fonts/lv_symbol_def.h b/lv_misc/lv_symbol_def.h
similarity index 98%
rename from lv_misc/lv_fonts/lv_symbol_def.h
rename to lv_misc/lv_symbol_def.h
index 925b9886df..9d46d77924 100644
--- a/lv_misc/lv_fonts/lv_symbol_def.h
+++ b/lv_misc/lv_symbol_def.h
@@ -4,8 +4,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#include "../../../lv_conf.h"
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
 
 /*
  * With no UTF-8 support (192-255)
diff --git a/lv_misc/lv_task.h b/lv_misc/lv_task.h
index aa8cb82051..d4106c0d08 100644
--- a/lv_misc/lv_task.h
+++ b/lv_misc/lv_task.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_txt.h b/lv_misc/lv_txt.h
index 852c5cdcb6..56664ecbe8 100644
--- a/lv_misc/lv_txt.h
+++ b/lv_misc/lv_txt.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_misc/lv_ufs.h b/lv_misc/lv_ufs.h
index b3a83fff89..3ee1fa3fc9 100644
--- a/lv_misc/lv_ufs.h
+++ b/lv_misc/lv_ufs.h
@@ -15,7 +15,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h
index e3c76beb4d..1a9ef5c2ff 100644
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h
index 206e111108..6ab035020a 100644
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_btnm.h b/lv_objx/lv_btnm.h
index 7354961425..03e62ade64 100644
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_cb.h b/lv_objx/lv_cb.h
index 1f522000b1..f80b300d30 100644
--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_chart.h b/lv_objx/lv_chart.h
index 09b68f5423..84a3931426 100644
--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_cont.h b/lv_objx/lv_cont.h
index 3be3eb4f13..335b8c2821 100644
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index a05ef924d1..bf2a198cb7 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -14,7 +14,7 @@
 #include "../lv_core/lv_group.h"
 #include "../lv_core/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 #include "../lv_misc/lv_anim.h"
 
 /*********************
diff --git a/lv_objx/lv_ddlist.h b/lv_objx/lv_ddlist.h
index 722100d02b..e6f27b194a 100644
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h
index 9354371f58..3ac1908fcd 100644
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h
index cba7a0f280..4922af0749 100644
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -23,7 +23,7 @@ extern "C" {
 
 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 #include "lv_label.h"
 #include "../lv_draw/lv_draw.h"
 
diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h
index 7d9abbaccc..5042432c56 100644
--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h
index 2940133355..d30110ab59 100644
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
@@ -24,7 +24,7 @@ extern "C" {
 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_fonts/lv_symbol_def.h"
+#include "../lv_misc/lv_symbol_def.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_led.h b/lv_objx/lv_led.h
index 8815f1b2a2..63f7898fb3 100644
--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h
index a5e6966d87..70883bac57 100644
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h
index 70293db2c3..2b40f7ffec 100644
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h
index 0bee226b9c..f33acbe575 100644
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h
index f64f47e287..66588b3c30 100644
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_objx.mk b/lv_objx/lv_objx.mk
index 2100ee5a26..65553680e4 100644
--- a/lv_objx/lv_objx.mk
+++ b/lv_objx/lv_objx.mk
@@ -5,7 +5,7 @@ CSRCS += lv_ddlist.c
 CSRCS += lv_kb.c
 CSRCS += lv_line.c
 CSRCS += lv_mbox.c
-CSRCS += lv_preloader.c
+CSRCS += lv_preload.c
 CSRCS += lv_roller.c
 CSRCS += lv_tabview.c
 CSRCS += lv_btn.c
diff --git a/lv_objx/lv_objx_templ.h b/lv_objx/lv_objx_templ.h
index 3520128f21..b921a24c02 100644
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -21,7 +21,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h
index d2cb909afa..f6c746516d 100644
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h
index 0d89e14501..71c5d95439 100644
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h
index b09a8bf8c6..1cae9b00ed 100644
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_sw.h b/lv_objx/lv_sw.h
index eec83ae763..898b4efe0e 100644
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h
index 172915cf4e..a89383d7c2 100644
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_tabview.h b/lv_objx/lv_tabview.h
index 810f21dc30..beee8e1121 100644
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h
index b1df228ba7..94be309de3 100644
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme.h b/lv_themes/lv_theme.h
index 3fad528207..65f34b7fa8 100644
--- a/lv_themes/lv_theme.h
+++ b/lv_themes/lv_theme.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_alien.h b/lv_themes/lv_theme_alien.h
index 9430d77485..7d97cb8c64 100644
--- a/lv_themes/lv_theme_alien.h
+++ b/lv_themes/lv_theme_alien.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_default.h b/lv_themes/lv_theme_default.h
index c6e18bc9dc..9ec74a951d 100644
--- a/lv_themes/lv_theme_default.h
+++ b/lv_themes/lv_theme_default.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_material.h b/lv_themes/lv_theme_material.h
index 5894e2d7fb..306f0957e7 100644
--- a/lv_themes/lv_theme_material.h
+++ b/lv_themes/lv_theme_material.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_mono.h b/lv_themes/lv_theme_mono.h
index ad07e31e83..a7c8c8c2f0 100644
--- a/lv_themes/lv_theme_mono.h
+++ b/lv_themes/lv_theme_mono.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_night.h b/lv_themes/lv_theme_night.h
index e132ba4ffc..3c760c3190 100644
--- a/lv_themes/lv_theme_night.h
+++ b/lv_themes/lv_theme_night.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_templ.h b/lv_themes/lv_theme_templ.h
index 2d2f1cdec3..e70af4fe15 100644
--- a/lv_themes/lv_theme_templ.h
+++ b/lv_themes/lv_theme_templ.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"
diff --git a/lv_themes/lv_theme_zen.h b/lv_themes/lv_theme_zen.h
index 3a60cd8b6e..27b190922c 100644
--- a/lv_themes/lv_theme_zen.h
+++ b/lv_themes/lv_theme_zen.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#if LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
 #include "../../lv_conf.h"