diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c
index ab2978f071..b55651025b 100644
--- a/lv_draw/lv_draw.c
+++ b/lv_draw/lv_draw.c
@@ -6,7 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include <lvgl/lv_misc/lv_txt.h>
 #include "lv_conf.h"
 
 #include <stdio.h>
@@ -65,17 +64,13 @@ static void point_swap(lv_point_t * p1, lv_point_t * p2);
 static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_vpx;
 static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) =  lv_vfill;
 static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_vletter;
-#if USE_FSINT != 0
 static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_vmap;
-#endif
 #else
 static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx;
 static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) =  lv_rfill;
 static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_rletter;
-#if USE_LV_IMG != 0 && USE_FSINT != 0
 static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_rmap;
 #endif
-#endif
 
 
 /**********************
@@ -344,7 +339,6 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
     }
 }
 
-#if USE_FSINT != 0
 /**
  * Draw an image
  * @param coords the coordinates of the image
@@ -389,7 +383,6 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
 
             bool const_data = false;
 
-#if USE_UFS != 0
             /*If the img. data is inside the MCU then do not use FS reading just a pointer*/
             if(fn[0] == UFS_LETTER) {
                 const_data = true;
@@ -397,7 +390,6 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
                 f_data += sizeof(lv_img_raw_header_t);
                 map_fp(coords, &mask_com, (void*)f_data , style->image.opa, header.transp, upscale, style->image.color, style->image.intense);
             }
-#endif
 
             /*Read the img. with the FS interface*/
             if(const_data == false) {
@@ -448,7 +440,6 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
         }
     }
 }
-#endif
 
 /**
  * Draw a line
diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h
index 84b9a3e97e..631b85d35d 100644
--- a/lv_draw/lv_draw.h
+++ b/lv_draw/lv_draw.h
@@ -13,9 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-#include <lvgl/lv_misc/lv_txt.h>
 #include "../lv_obj/lv_style.h"
+#include "../lv_misc/lv_txt.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_misc/lv_anim.c b/lv_misc/lv_anim.c
index 3aa82500b1..0cdc70f9fa 100644
--- a/lv_misc/lv_anim.c
+++ b/lv_misc/lv_anim.c
@@ -6,17 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
+#include "lv_conf.h"
 #include <stddef.h>
 #include <string.h>
-
 #include "lv_task.h"
 #include "lv_anim.h"
-
-#if USE_ANIM != 0
 #include "lv_math.h"
-#include MISC_SYSTICK_INCLUDE
 
 /*********************
  *      DEFINES
@@ -69,8 +64,8 @@ static lv_anim_path_t anim_path_step[] =
 void lv_anim_init(void)
 {
 	lv_ll_init(&anim_ll, sizeof(lv_anim_t));
-	last_task_run = MISC_SYSTICK_GET();
-	lv_task_create(anim_task, ANIM_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
+	last_task_run = lv_tick_get();
+	lv_task_create(anim_task, LV_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
 }
 
 /**
@@ -84,7 +79,7 @@ void lv_anim_create(lv_anim_t * anim_p)
 
 	/*Add the new animation to the animation linked list*/
 	lv_anim_t * new_anim = lv_ll_ins_head(&anim_ll);
-	dm_assert(new_anim);
+	lv_mem_assert(new_anim);
 
 	/*Initialize the animation descriptor*/
 	anim_p->playback_now = 0;
@@ -173,7 +168,7 @@ lv_anim_path_t * lv_anim_get_path(lv_anim_path_name_t name)
 static void anim_task (void * param)
 {
 	volatile uint32_t elaps;
-	elaps = MISC_SYSTICK_ELAPS(last_task_run);
+	elaps = lv_tick_elaps(last_task_run);
 
 	lv_anim_t * a;
 	lv_anim_t * a_next;
@@ -215,7 +210,7 @@ static void anim_task (void * param)
 		a = a_next;
 	}
 
-	last_task_run = MISC_SYSTICK_GET();
+	last_task_run = lv_tick_get();
 }
 
 /**
@@ -265,91 +260,3 @@ static bool anim_ready_handler(lv_anim_t * a)
 
 	return invalid;
 }
-
-/*For compatibility add dummy functions*/
-#else
-
-#if USE_LV_TASK != 0
-static void anim_dummy_handler(void * anim_dm);
-#endif
-
-/**
- * Create an animation. Immediately set to end value
- * @param anim_p an initialized 'anim_t' variable. Not required after call.
- */
-void lv_anim_create(lv_anim_t * anim_p)
-{
-
-    /*If no delay simply set the end value end call the callback */
-    if(anim_p->act_time == 0) {
-        if(anim_p->fp != NULL) anim_p->fp(anim_p->var, anim_p->end);
-        if(anim_p->end_cb != NULL) anim_p->end_cb(anim_p->var);
-    }
-    /*With delay set the start value and set a one shot lv_task to set end value and call the callback*/
-    else {
-#if USE_DYN_MEM != 0 && USE_LV_TASK != 0
-        if(anim_p->fp != NULL) anim_p->fp(anim_p->var, anim_p->start);
-        void * anim_dm = dm_alloc(sizeof(lv_anim_t));
-        memcpy(anim_dm, anim_p, sizeof(lv_anim_t));
-        lv_task_t * lv_task = lv_task_create(anim_dummy_handler, -anim_p->act_time, LV_TASK_PRIO_LOW, anim_dm);
-        lv_task_once(lv_task);
-#else
-        if(anim_p->fp != NULL) anim_p->fp(anim_p->var, anim_p->end);
-        if(anim_p->end_cb != NULL) anim_p->end_cb(anim_p->var);
-#endif
-    }
-}
-
-/**
- * Delete an animation for a variable with a given animatior function (Now do nothing)
- * @param var pointer to variable
- * @param fp a function pointer which is animating 'var',
- *           or NULL to ignore it and delete all animation with 'var
- * @return true: at least 1 animation is deleted, false: no animation is deleted
- */
-bool lv_anim_del(void * var, lv_anim_fp_t fp)
-{
-    return false;
-}
-
-/**
- * Calculate the time of an animation with a given speed and the start and end values (Give dummy value)
- * @param speed speed of animation in unit/sec
- * @param start start value of the animation
- * @param end end value of the animation
- * @return the required time [ms] for the animation with the given parameters
- */
-uint16_t lv_anim_speed_to_time(uint16_t speed, int32_t start, int32_t end)
-{
-    return 1;
-}
-
-/**
- * Get a predefine animation path (Give NULL)
- * @param name name of the path from 'anim_path_name_t'
- * @return pointer to the path array
- */
-lv_anim_path_t * lv_anim_get_path(lv_anim_path_name_t name)
-{
-    return NULL;
-}
-
-#if USE_LV_TASK != 0
-
-/**
- * A One Shot lv_task to handle end callbacks with delay
- * @param anim_dm pointer to temporal dynamically allocated animation
- */
-static void anim_dummy_handler(void * anim_dm)
-{
-    lv_anim_t * anim = anim_dm;
-
-    if(anim->fp != NULL) anim->fp(anim->var, anim->end);
-    if(anim->end_cb != NULL) anim->end_cb(anim->var);
-
-    lv_mem_free(anim_dm);
-}
-#endif
-
-#endif /*USE_ANIM*/
-
diff --git a/lv_misc/lv_anim.h b/lv_misc/lv_anim.h
index 3f19739827..934f0e5ad9 100644
--- a/lv_misc/lv_anim.h
+++ b/lv_misc/lv_anim.h
@@ -14,9 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-/*For compatibility always include this header*/
-
 #include <stdint.h>
 #include <stdbool.h>
 
diff --git a/lv_misc/lv_area.c b/lv_misc/lv_area.c
index 0be928a3cb..5423627d46 100644
--- a/lv_misc/lv_area.c
+++ b/lv_misc/lv_area.c
@@ -6,8 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include "lv_area.h"
 #include "lv_math.h"
 
diff --git a/lv_misc/lv_area.h b/lv_misc/lv_area.h
index 448f477793..361e23dd3d 100644
--- a/lv_misc/lv_area.h
+++ b/lv_misc/lv_area.h
@@ -14,9 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-#if USE_AREA != 0
-
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -164,8 +161,6 @@ bool lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p);
  *      MACROS
  **********************/
 
-#endif /*USE_AREA*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/lv_misc/lv_circ.c b/lv_misc/lv_circ.c
index b1d0e71e82..c0396131f0 100644
--- a/lv_misc/lv_circ.c
+++ b/lv_misc/lv_circ.c
@@ -8,8 +8,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include "lv_area.h"
 
 /*********************
diff --git a/lv_misc/lv_circ.h b/lv_misc/lv_circ.h
index 0846dd01aa..ae67d09d0f 100644
--- a/lv_misc/lv_circ.h
+++ b/lv_misc/lv_circ.h
@@ -14,11 +14,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-#if USE_CIRC != 0
-
-#include "lv_area.h"
 #include <stddef.h>
+#include "lv_area.h"
 
 /*********************
  *      DEFINES
@@ -74,8 +71,6 @@ void lv_circ_next(lv_point_t * c, lv_coord_t * tmp);
  *      MACROS
  **********************/
 
-#endif /*USE_CIRC*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h
index 1ab0b24912..ce5f5715df 100644
--- a/lv_misc/lv_color.h
+++ b/lv_misc/lv_color.h
@@ -3,8 +3,8 @@
  * 
  */
 
-#ifndef LV_LV_COLOR_H
-#define LV_LV_COLOR_H
+#ifndef LV_COLOR_H
+#define LV_COLOR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #include <stdint.h>
 
diff --git a/lv_misc/lv_font.c b/lv_misc/lv_font.c
index eada28bcd3..0053a8f562 100644
--- a/lv_misc/lv_font.c
+++ b/lv_misc/lv_font.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #include <stddef.h>
 #include "lv_font.h"
diff --git a/lv_misc/lv_font.h b/lv_misc/lv_font.h
index 1bd7e7d823..6ade48c7b5 100644
--- a/lv_misc/lv_font.h
+++ b/lv_misc/lv_font.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #include <stdint.h>
 #include <stddef.h>
@@ -101,7 +101,7 @@ uint8_t lv_font_get_width(const lv_font_t * font_p, uint32_t letter);
  */
 static inline uint8_t lv_font_get_width_scale(const lv_font_t * font_p, uint32_t letter)
 {
-    return lv_font_get_width(font_p, letter) >> FONT_ANTIALIAS;
+    return lv_font_get_width(font_p, letter) >> LV_FONT_ANTIALIAS;
 }
 
 /**********************
diff --git a/lv_misc/lv_fonts/dejavu_10.c b/lv_misc/lv_fonts/dejavu_10.c
index 6dd24625b3..b0fec9c678 100644
--- a/lv_misc/lv_fonts/dejavu_10.c
+++ b/lv_misc/lv_fonts/dejavu_10.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10 != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10.h b/lv_misc/lv_fonts/dejavu_10.h
index 6f1be9a731..573566a5e1 100644
--- a/lv_misc/lv_fonts/dejavu_10.h
+++ b/lv_misc/lv_fonts/dejavu_10.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10 != 0
 
@@ -14,4 +14,4 @@ extern lv_font_t lv_font_dejavu_10;
 
 #endif   /*USE_LV_FONT_DEJAVU_10 != 0*/
 
-#endif   /*DEJAVU_10_H*/
\ No newline at end of file
+#endif   /*DEJAVU_10_H*/
diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.c b/lv_misc/lv_fonts/dejavu_10_cyrillic.c
index 517da2d6a0..41838a0eba 100644
--- a/lv_misc/lv_fonts/dejavu_10_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.h b/lv_misc/lv_fonts/dejavu_10_cyrillic.h
index 320e4d8a7a..c7a88ac4c1 100644
--- a/lv_misc/lv_fonts/dejavu_10_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c
index 6493d3f62a..a5fee78f8d 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
index 526a10a96e..f3c187027b 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c
index c476cb20c3..a022db1757 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
index 8d7fd51bb8..e357c47765 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_sup.c b/lv_misc/lv_fonts/dejavu_10_sup.c
index dcbcd6e35f..b8fd939bf9 100644
--- a/lv_misc/lv_fonts/dejavu_10_sup.c
+++ b/lv_misc/lv_fonts/dejavu_10_sup.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_SUP != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_sup.h b/lv_misc/lv_fonts/dejavu_10_sup.h
index fc19b204a9..98b0566077 100644
--- a/lv_misc/lv_fonts/dejavu_10_sup.h
+++ b/lv_misc/lv_fonts/dejavu_10_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_SUP != 0
 
@@ -14,4 +14,4 @@ extern lv_font_t lv_font_dejavu_10_sup;
 
 #endif   /*USE_LV_FONT_DEJAVU_10_SUP != 0*/
 
-#endif   /*DEJAVU_10_SUP_H*/
\ No newline at end of file
+#endif   /*DEJAVU_10_SUP_H*/
diff --git a/lv_misc/lv_fonts/dejavu_20.c b/lv_misc/lv_fonts/dejavu_20.c
index ee9c3c7cde..0b8768305e 100644
--- a/lv_misc/lv_fonts/dejavu_20.c
+++ b/lv_misc/lv_fonts/dejavu_20.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20 != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20.h b/lv_misc/lv_fonts/dejavu_20.h
index d091d76022..ebfefc59b7 100644
--- a/lv_misc/lv_fonts/dejavu_20.h
+++ b/lv_misc/lv_fonts/dejavu_20.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.c b/lv_misc/lv_fonts/dejavu_20_cyrillic.c
index 54e9d49b61..f1329dbe74 100644
--- a/lv_misc/lv_fonts/dejavu_20_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.h b/lv_misc/lv_fonts/dejavu_20_cyrillic.h
index dee1219b0c..33d97f6ea1 100644
--- a/lv_misc/lv_fonts/dejavu_20_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c
index c1cfb08c9b..01a6243143 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
index bfd324a70c..13dd0b3657 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c
index 29290b2edf..82dbceea31 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
index d70f44f8ce..2bed23307c 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_sup.c b/lv_misc/lv_fonts/dejavu_20_sup.c
index 7ae798524f..44bc4f696d 100644
--- a/lv_misc/lv_fonts/dejavu_20_sup.c
+++ b/lv_misc/lv_fonts/dejavu_20_sup.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_SUP != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_sup.h b/lv_misc/lv_fonts/dejavu_20_sup.h
index ee79693670..32e1d6efc6 100644
--- a/lv_misc/lv_fonts/dejavu_20_sup.h
+++ b/lv_misc/lv_fonts/dejavu_20_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30.c b/lv_misc/lv_fonts/dejavu_30.c
index 8383d8aafc..a5ff1b2ec9 100644
--- a/lv_misc/lv_fonts/dejavu_30.c
+++ b/lv_misc/lv_fonts/dejavu_30.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30 != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30.h b/lv_misc/lv_fonts/dejavu_30.h
index 6d5e730ffa..ee051930d3 100644
--- a/lv_misc/lv_fonts/dejavu_30.h
+++ b/lv_misc/lv_fonts/dejavu_30.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.c b/lv_misc/lv_fonts/dejavu_30_cyrillic.c
index c0d027ecac..4743b78753 100644
--- a/lv_misc/lv_fonts/dejavu_30_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.h b/lv_misc/lv_fonts/dejavu_30_cyrillic.h
index 59dbaa79fe..eba0019ab5 100644
--- a/lv_misc/lv_fonts/dejavu_30_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c
index 1dca74609b..7a0177a917 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
index 4ac340d574..e8e6513ef9 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c
index 54f115bf71..22b304cbfd 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
index 47c72e37c9..33e8e8f64f 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_sup.c b/lv_misc/lv_fonts/dejavu_30_sup.c
index 6edaf52f2c..ce3681ada4 100644
--- a/lv_misc/lv_fonts/dejavu_30_sup.c
+++ b/lv_misc/lv_fonts/dejavu_30_sup.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_SUP != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_sup.h b/lv_misc/lv_fonts/dejavu_30_sup.h
index 62034b92d7..b59c4ae315 100644
--- a/lv_misc/lv_fonts/dejavu_30_sup.h
+++ b/lv_misc/lv_fonts/dejavu_30_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40.c b/lv_misc/lv_fonts/dejavu_40.c
index d8c42fbd6d..563fb7ca88 100644
--- a/lv_misc/lv_fonts/dejavu_40.c
+++ b/lv_misc/lv_fonts/dejavu_40.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40.h b/lv_misc/lv_fonts/dejavu_40.h
index a1cc2a5b8e..9d6c2375b6 100644
--- a/lv_misc/lv_fonts/dejavu_40.h
+++ b/lv_misc/lv_fonts/dejavu_40.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.c b/lv_misc/lv_fonts/dejavu_40_cyrillic.c
index c179cf6e57..5e143e3f3b 100644
--- a/lv_misc/lv_fonts/dejavu_40_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.h b/lv_misc/lv_fonts/dejavu_40_cyrillic.h
index a547bea731..5d4a578513 100644
--- a/lv_misc/lv_fonts/dejavu_40_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c
index 112a53bad5..21cad0b71f 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h
index 160cef0084..ea4d81174b 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c
index a17439d54e..a3734f6d9e 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h
index 56f9da9b31..758cfb55f0 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_sup.c b/lv_misc/lv_fonts/dejavu_40_sup.c
index 827f4e2af9..0e59b297a8 100644
--- a/lv_misc/lv_fonts/dejavu_40_sup.c
+++ b/lv_misc/lv_fonts/dejavu_40_sup.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_sup.h b/lv_misc/lv_fonts/dejavu_40_sup.h
index 699cb9f53c..f2d676402b 100644
--- a/lv_misc/lv_fonts/dejavu_40_sup.h
+++ b/lv_misc/lv_fonts/dejavu_40_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60.c b/lv_misc/lv_fonts/dejavu_60.c
index e1c7954711..4f7053ca9a 100644
--- a/lv_misc/lv_fonts/dejavu_60.c
+++ b/lv_misc/lv_fonts/dejavu_60.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60 != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60.h b/lv_misc/lv_fonts/dejavu_60.h
index 67b05aa628..4ddbaa3fd5 100644
--- a/lv_misc/lv_fonts/dejavu_60.h
+++ b/lv_misc/lv_fonts/dejavu_60.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.c b/lv_misc/lv_fonts/dejavu_60_cyrillic.c
index 07b5c88476..00c2e8560f 100644
--- a/lv_misc/lv_fonts/dejavu_60_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.h b/lv_misc/lv_fonts/dejavu_60_cyrillic.h
index b0a844a340..7624cc94de 100644
--- a/lv_misc/lv_fonts/dejavu_60_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c
index a203e91bcb..df3cb8c3ad 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
index b6b8beb619..aee2e3115b 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c
index ebdf403910..aed413436c 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
index 3bc153afe2..24bcee68d7 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_sup.c b/lv_misc/lv_fonts/dejavu_60_sup.c
index acf7c621e4..94d90f941f 100644
--- a/lv_misc/lv_fonts/dejavu_60_sup.c
+++ b/lv_misc/lv_fonts/dejavu_60_sup.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_SUP != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_sup.h b/lv_misc/lv_fonts/dejavu_60_sup.h
index 23d61ae712..ec5d69f29a 100644
--- a/lv_misc/lv_fonts/dejavu_60_sup.h
+++ b/lv_misc/lv_fonts/dejavu_60_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80.c b/lv_misc/lv_fonts/dejavu_80.c
index 887a809882..ea1c67aa54 100644
--- a/lv_misc/lv_fonts/dejavu_80.c
+++ b/lv_misc/lv_fonts/dejavu_80.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80 != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80.h b/lv_misc/lv_fonts/dejavu_80.h
index aea2a327eb..28dec4f93c 100644
--- a/lv_misc/lv_fonts/dejavu_80.h
+++ b/lv_misc/lv_fonts/dejavu_80.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.c b/lv_misc/lv_fonts/dejavu_80_cyrillic.c
index d3475d0e2c..e8336ede88 100644
--- a/lv_misc/lv_fonts/dejavu_80_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.h b/lv_misc/lv_fonts/dejavu_80_cyrillic.h
index 54d0208bfd..c9c5620139 100644
--- a/lv_misc/lv_fonts/dejavu_80_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c
index ab704ce09e..0c5014c880 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
index ec1c75f88d..bd650a5758 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c
index 187a0357d4..c239c6174f 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
index 86eed9aac6..4fc7b2305d 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_sup.c b/lv_misc/lv_fonts/dejavu_80_sup.c
index 67c5243164..c59aa3a7f0 100644
--- a/lv_misc/lv_fonts/dejavu_80_sup.c
+++ b/lv_misc/lv_fonts/dejavu_80_sup.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_SUP != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_sup.h b/lv_misc/lv_fonts/dejavu_80_sup.h
index d60f6230f6..4b1976efdb 100644
--- a/lv_misc/lv_fonts/dejavu_80_sup.h
+++ b/lv_misc/lv_fonts/dejavu_80_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_SUP != 0
 
diff --git a/lv_misc/lv_fonts/symbol_10_basic.c b/lv_misc/lv_fonts/symbol_10_basic.c
index fadb3dacf5..2d0be21b06 100644
--- a/lv_misc/lv_fonts/symbol_10_basic.c
+++ b/lv_misc/lv_fonts/symbol_10_basic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_10_BASIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_10_basic.h b/lv_misc/lv_fonts/symbol_10_basic.h
index c8b556b443..4c403ca628 100644
--- a/lv_misc/lv_fonts/symbol_10_basic.h
+++ b/lv_misc/lv_fonts/symbol_10_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_10_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_10_feedback.c b/lv_misc/lv_fonts/symbol_10_feedback.c
index 1bc127fea3..2a5a535ae7 100644
--- a/lv_misc/lv_fonts/symbol_10_feedback.c
+++ b/lv_misc/lv_fonts/symbol_10_feedback.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_10_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_10_feedback.h b/lv_misc/lv_fonts/symbol_10_feedback.h
index 22010f5afb..5ff04990d6 100644
--- a/lv_misc/lv_fonts/symbol_10_feedback.h
+++ b/lv_misc/lv_fonts/symbol_10_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_10_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_10_file.c b/lv_misc/lv_fonts/symbol_10_file.c
index ac117b1fb2..b6dc8ab32e 100644
--- a/lv_misc/lv_fonts/symbol_10_file.c
+++ b/lv_misc/lv_fonts/symbol_10_file.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_10_FILE != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_10_file.h b/lv_misc/lv_fonts/symbol_10_file.h
index 51f541108b..cef1a3dc78 100644
--- a/lv_misc/lv_fonts/symbol_10_file.h
+++ b/lv_misc/lv_fonts/symbol_10_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_10_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_20_basic.c b/lv_misc/lv_fonts/symbol_20_basic.c
index 39040cdf00..70e6ea08fc 100644
--- a/lv_misc/lv_fonts/symbol_20_basic.c
+++ b/lv_misc/lv_fonts/symbol_20_basic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_20_BASIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_20_basic.h b/lv_misc/lv_fonts/symbol_20_basic.h
index 7dbad12d22..0697e85d2a 100644
--- a/lv_misc/lv_fonts/symbol_20_basic.h
+++ b/lv_misc/lv_fonts/symbol_20_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_20_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_20_feedback.c b/lv_misc/lv_fonts/symbol_20_feedback.c
index 01414c9497..84b9aeb999 100644
--- a/lv_misc/lv_fonts/symbol_20_feedback.c
+++ b/lv_misc/lv_fonts/symbol_20_feedback.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_20_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_20_feedback.h b/lv_misc/lv_fonts/symbol_20_feedback.h
index 287e9dff3c..e5f8d012ce 100644
--- a/lv_misc/lv_fonts/symbol_20_feedback.h
+++ b/lv_misc/lv_fonts/symbol_20_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_20_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_20_file.c b/lv_misc/lv_fonts/symbol_20_file.c
index e6554e3ba1..204cbba1b4 100644
--- a/lv_misc/lv_fonts/symbol_20_file.c
+++ b/lv_misc/lv_fonts/symbol_20_file.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_20_FILE != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_20_file.h b/lv_misc/lv_fonts/symbol_20_file.h
index 3a311e5de6..41edd920d2 100644
--- a/lv_misc/lv_fonts/symbol_20_file.h
+++ b/lv_misc/lv_fonts/symbol_20_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_20_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_30_basic.c b/lv_misc/lv_fonts/symbol_30_basic.c
index 58fca682ff..f3bc495899 100644
--- a/lv_misc/lv_fonts/symbol_30_basic.c
+++ b/lv_misc/lv_fonts/symbol_30_basic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_30_BASIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_30_basic.h b/lv_misc/lv_fonts/symbol_30_basic.h
index a183a47814..e4d9458bab 100644
--- a/lv_misc/lv_fonts/symbol_30_basic.h
+++ b/lv_misc/lv_fonts/symbol_30_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_30_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_30_feedback.c b/lv_misc/lv_fonts/symbol_30_feedback.c
index 7060092927..c5ea3c1bf0 100644
--- a/lv_misc/lv_fonts/symbol_30_feedback.c
+++ b/lv_misc/lv_fonts/symbol_30_feedback.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_30_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_30_feedback.h b/lv_misc/lv_fonts/symbol_30_feedback.h
index c73a08c62e..ae5671aee8 100644
--- a/lv_misc/lv_fonts/symbol_30_feedback.h
+++ b/lv_misc/lv_fonts/symbol_30_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_30_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_30_file.c b/lv_misc/lv_fonts/symbol_30_file.c
index 2792f9a959..2f92eeead1 100644
--- a/lv_misc/lv_fonts/symbol_30_file.c
+++ b/lv_misc/lv_fonts/symbol_30_file.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_30_FILE != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_30_file.h b/lv_misc/lv_fonts/symbol_30_file.h
index 57f3f1c0b9..6dcbf0befe 100644
--- a/lv_misc/lv_fonts/symbol_30_file.h
+++ b/lv_misc/lv_fonts/symbol_30_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_30_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_40_basic.c b/lv_misc/lv_fonts/symbol_40_basic.c
index c028b1e0a4..04f1dd64e7 100644
--- a/lv_misc/lv_fonts/symbol_40_basic.c
+++ b/lv_misc/lv_fonts/symbol_40_basic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_40_BASIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_40_basic.h b/lv_misc/lv_fonts/symbol_40_basic.h
index 2321454ac7..4a9f2fb2ff 100644
--- a/lv_misc/lv_fonts/symbol_40_basic.h
+++ b/lv_misc/lv_fonts/symbol_40_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_40_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_40_feedback.c b/lv_misc/lv_fonts/symbol_40_feedback.c
index dd533ef77d..2aa2852982 100644
--- a/lv_misc/lv_fonts/symbol_40_feedback.c
+++ b/lv_misc/lv_fonts/symbol_40_feedback.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_40_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_40_feedback.h b/lv_misc/lv_fonts/symbol_40_feedback.h
index 233751c910..a416842678 100644
--- a/lv_misc/lv_fonts/symbol_40_feedback.h
+++ b/lv_misc/lv_fonts/symbol_40_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_40_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_40_file.c b/lv_misc/lv_fonts/symbol_40_file.c
index f1e69e7115..31b3bc714c 100644
--- a/lv_misc/lv_fonts/symbol_40_file.c
+++ b/lv_misc/lv_fonts/symbol_40_file.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_40_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_40_file.h b/lv_misc/lv_fonts/symbol_40_file.h
index 0211119cf3..36f6d130c2 100644
--- a/lv_misc/lv_fonts/symbol_40_file.h
+++ b/lv_misc/lv_fonts/symbol_40_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_40_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_60_basic.c b/lv_misc/lv_fonts/symbol_60_basic.c
index 238edfc9a9..86dbedfc04 100644
--- a/lv_misc/lv_fonts/symbol_60_basic.c
+++ b/lv_misc/lv_fonts/symbol_60_basic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_60_BASIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_60_basic.h b/lv_misc/lv_fonts/symbol_60_basic.h
index c981a5fb9c..9184460090 100644
--- a/lv_misc/lv_fonts/symbol_60_basic.h
+++ b/lv_misc/lv_fonts/symbol_60_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_60_feedback.c b/lv_misc/lv_fonts/symbol_60_feedback.c
index bae4331b4d..c3bc6ee53a 100644
--- a/lv_misc/lv_fonts/symbol_60_feedback.c
+++ b/lv_misc/lv_fonts/symbol_60_feedback.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_60_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_60_feedback.h b/lv_misc/lv_fonts/symbol_60_feedback.h
index 90027a7061..c0dd785fbb 100644
--- a/lv_misc/lv_fonts/symbol_60_feedback.h
+++ b/lv_misc/lv_fonts/symbol_60_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_60_file.c b/lv_misc/lv_fonts/symbol_60_file.c
index e22436bbcc..fc286e964f 100644
--- a/lv_misc/lv_fonts/symbol_60_file.c
+++ b/lv_misc/lv_fonts/symbol_60_file.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_60_FILE != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_60_file.h b/lv_misc/lv_fonts/symbol_60_file.h
index af8cd0c39f..eee7f82b11 100644
--- a/lv_misc/lv_fonts/symbol_60_file.h
+++ b/lv_misc/lv_fonts/symbol_60_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_80_basic.c b/lv_misc/lv_fonts/symbol_80_basic.c
index 2219ba00f6..8cee7466ef 100644
--- a/lv_misc/lv_fonts/symbol_80_basic.c
+++ b/lv_misc/lv_fonts/symbol_80_basic.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_80_BASIC != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_80_basic.h b/lv_misc/lv_fonts/symbol_80_basic.h
index da8a2f44fc..32c4a83943 100644
--- a/lv_misc/lv_fonts/symbol_80_basic.h
+++ b/lv_misc/lv_fonts/symbol_80_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_80_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_80_feedback.c b/lv_misc/lv_fonts/symbol_80_feedback.c
index d3ba390f7e..82b84343e0 100644
--- a/lv_misc/lv_fonts/symbol_80_feedback.c
+++ b/lv_misc/lv_fonts/symbol_80_feedback.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_80_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_80_feedback.h b/lv_misc/lv_fonts/symbol_80_feedback.h
index a9f37792a6..0f0cff9547 100644
--- a/lv_misc/lv_fonts/symbol_80_feedback.h
+++ b/lv_misc/lv_fonts/symbol_80_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_80_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_80_file.c b/lv_misc/lv_fonts/symbol_80_file.c
index 0e7a3f922d..c698689b53 100644
--- a/lv_misc/lv_fonts/symbol_80_file.c
+++ b/lv_misc/lv_fonts/symbol_80_file.c
@@ -1,4 +1,4 @@
-#include "misc_conf.h"
+#include "lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_80_FILE != 0
 #include <stdint.h>
 #include "../lv_misc/lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_80_file.h b/lv_misc/lv_fonts/symbol_80_file.h
index bc41882b31..3a1b70a12b 100644
--- a/lv_misc/lv_fonts/symbol_80_file.h
+++ b/lv_misc/lv_fonts/symbol_80_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_80_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_def.h b/lv_misc/lv_fonts/symbol_def.h
index f94cd516e5..033bc84b39 100644
--- a/lv_misc/lv_fonts/symbol_def.h
+++ b/lv_misc/lv_fonts/symbol_def.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "misc_conf.h"
+#include "lv_conf.h"
 
 /*
  * With no UTF-8 support (192-255)
diff --git a/lv_misc/lv_fs.c b/lv_misc/lv_fs.c
index 651f6812ce..7e418fd8d3 100644
--- a/lv_misc/lv_fs.c
+++ b/lv_misc/lv_fs.c
@@ -1,15 +1,11 @@
 /**
- * @file lv_fs_int.c
+ * @file lv_fs.c
  * 
  */
 
 /*********************
  *      INCLUDES
  *********************/
-
-#include "misc_conf.h"
-#if USE_FSINT != 0
-
 #include "lv_fs.h"
 #include "lv_ll.h"
 #include <string.h>
@@ -389,7 +385,7 @@ void lv_fs_add_drv(lv_fs_drv_t * drv_p)
    /*Save the new driver*/
    lv_fs_drv_t* new_drv;
    new_drv =  lv_ll_ins_head(&drv_ll); 
-   dm_assert(new_drv);
+   lv_mem_assert(new_drv);
    memcpy(new_drv, drv_p, sizeof(lv_fs_drv_t));
    
 }
@@ -536,5 +532,3 @@ static lv_fs_drv_t* lv_fs_get_drv(char letter)
     
     return NULL;
 }
-
-#endif
diff --git a/lv_misc/lv_fs.h b/lv_misc/lv_fs.h
index 026cdfbdd0..f0788164f9 100644
--- a/lv_misc/lv_fs.h
+++ b/lv_misc/lv_fs.h
@@ -14,8 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_mem.h"
@@ -23,7 +21,7 @@ extern "C" {
 /*********************
  *      DEFINES
  *********************/
-#define FSINT_MAX_FN_LENGTH  64
+#define LV_FS_MAX_FN_LENGTH  64
 
 /**********************
  *      TYPEDEFS
diff --git a/lv_misc/lv_ll.c b/lv_misc/lv_ll.c
index b444b0bac2..90f1bc36d6 100644
--- a/lv_misc/lv_ll.c
+++ b/lv_misc/lv_ll.c
@@ -7,8 +7,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lv_misc/lv_ll.h b/lv_misc/lv_ll.h
index 23d36c4b89..e063fbd759 100644
--- a/lv_misc/lv_ll.h
+++ b/lv_misc/lv_ll.h
@@ -14,9 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
-#if USE_LINKED_LIST != 0
 #include "lv_mem.h"
 #include <stdint.h>
 #include <stddef.h>
@@ -125,8 +122,6 @@ void * lv_ll_get_prev(lv_ll_t * ll_p, void * n_act);
 
 #define LL_READ_BACK(list, i) for(i = lv_ll_get_tail(&list); i != NULL; i = lv_ll_get_prev(&list, i))
 
-#endif /*USE_LINKED_LIST*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/lv_misc/lv_math.h b/lv_misc/lv_math.h
index 6fbaa7b6b8..d537f7de81 100644
--- a/lv_misc/lv_math.h
+++ b/lv_misc/lv_math.h
@@ -14,7 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_misc/lv_mem.c b/lv_misc/lv_mem.c
index d33f73152e..161290fee7 100644
--- a/lv_misc/lv_mem.c
+++ b/lv_misc/lv_mem.c
@@ -7,14 +7,13 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
+#include "lv_conf.h"
 #include "lv_mem.h"
 #include "lv_math.h"
 #include <string.h>
 
-#if DM_CUSTOM != 0
-#include DM_CUST_INCLUDE
+#if LV_MEM_CUSTOM != 0
+#include LV_MEM_CUSTOM_INCLUDE
 #endif
 
 /*********************
@@ -39,13 +38,13 @@ typedef union
 typedef struct
 {
     lv_mem_header_t header;
-    uint8_t first_data;        //First data in entry data
+    uint8_t first_data;        /*First data byte in the allocated data (Just for easily create a pointer)*/
 }lv_mem_ent_t;
 
 /**********************
  *  STATIC PROTOTYPES
  **********************/
-#if DM_CUSTOM == 0
+#if LV_MEM_CUSTOM == 0
 static lv_mem_ent_t  * ent_get_next(lv_mem_ent_t * act_e);
 static void * ent_alloc(lv_mem_ent_t * e, uint32_t size);
 static lv_mem_ent_t * ent_trunc(lv_mem_ent_t * e, uint32_t size);
@@ -54,8 +53,8 @@ static lv_mem_ent_t * ent_trunc(lv_mem_ent_t * e, uint32_t size);
 /**********************
  *  STATIC VARIABLES
  **********************/
-#if DM_CUSTOM == 0
-static DM_MEM_ATTR uint8_t work_mem[DM_MEM_SIZE] ;    //Work memory for allocation
+#if LV_MEM_CUSTOM == 0
+static LV_MEM_ATTR uint8_t work_mem[LV_MEM_SIZE];    /*Work memory for allocations*/
 #endif
 
 static uint32_t zero_mem;       /*Give the address of this variable if 0 byte should be allocated*/ 
@@ -73,11 +72,11 @@ static uint32_t zero_mem;       /*Give the address of this variable if 0 byte sh
  */
 void lv_mem_init(void)
 {
-#if DM_CUSTOM == 0
+#if LV_MEM_CUSTOM == 0
     lv_mem_ent_t * full = (lv_mem_ent_t *)&work_mem;
     full->header.used = 0;
     /*The total mem size id reduced by the first header and the close patterns */
-    full->header.d_size = DM_MEM_SIZE - sizeof(lv_mem_header_t);
+    full->header.d_size = LV_MEM_SIZE - sizeof(lv_mem_header_t);
 #endif
 }
 
@@ -100,7 +99,7 @@ void * lv_mem_alloc(uint32_t size)
     
     void * alloc = NULL;
 
-#if DM_CUSTOM == 0 /*Use the allocation from dyn_mem*/
+#if LV_MEM_CUSTOM == 0 /*Use the allocation from dyn_mem*/
     lv_mem_ent_t * e = NULL;
     
     //Search for a appropriate entry
@@ -116,7 +115,7 @@ void * lv_mem_alloc(uint32_t size)
     }while(e != NULL && alloc == NULL); 
 #else  /*Use custom, user defined malloc function*/
     /*Allocate a header too to store the size*/
-    alloc = DM_CUST_ALLOC(size + sizeof(lv_mem_header_t));
+    alloc = LV_MEM_CUSTOM_ALLOC(size + sizeof(lv_mem_header_t));
     if(alloc != NULL) {
         ((lv_mem_ent_t*) alloc)->header.d_size = size;
         ((lv_mem_ent_t*) alloc)->header.used = 1;
@@ -124,10 +123,6 @@ void * lv_mem_alloc(uint32_t size)
     }
 #endif
 
-#if DM_AUTO_ZERO != 0
-    if(alloc != NULL) memset(alloc, 0, size);
-#endif
-
     return alloc;
 }
 
@@ -144,7 +139,7 @@ void lv_mem_free(const void * data)
     lv_mem_ent_t * e = (lv_mem_ent_t *)((uint8_t *) data - sizeof(lv_mem_header_t));
     e->header.used = 0;
 
-#if DM_CUSTOM == 0 /*Use the free from dyn_mem*/
+#if LV_MEM_CUSTOM == 0 /*Use the free from dyn_mem*/
     /* Make a simple defrag.
      * Join the following free entries after this*/
     lv_mem_ent_t * e_next;
@@ -158,7 +153,7 @@ void lv_mem_free(const void * data)
         e_next = ent_get_next(e_next);
     }
 #else /*Use custom, user defined free function*/
-    DM_CUST_FREE(e);
+    LV_MEM_CUSTOM_FREE(e);
 #endif
 }
 
@@ -199,7 +194,7 @@ void * lv_mem_realloc(void * data_p, uint32_t new_size)
  */
 void lv_mem_defrag(void)
 {
-#if DM_CUSTOM == 0
+#if LV_MEM_CUSTOM == 0
     lv_mem_ent_t * e_free;
     lv_mem_ent_t * e_next;
     e_free = ent_get_next(NULL);
@@ -241,11 +236,11 @@ void lv_mem_defrag(void)
  * @param mon_p pointer to a dm_mon_p variable, 
  *              the result of the analysis will be stored here
  */
-void lv_mem_monitor(dm_mon_t * mon_p)
+void lv_mem_monitor(lv_mem_monitor_t * mon_p)
 {
     /*Init the data*/
-    memset(mon_p, 0, sizeof(dm_mon_t));
-#if DM_CUSTOM == 0
+    memset(mon_p, 0, sizeof(lv_mem_monitor_t));
+#if LV_MEM_CUSTOM == 0
     lv_mem_ent_t * e;
     e = NULL;
     
@@ -253,21 +248,21 @@ void lv_mem_monitor(dm_mon_t * mon_p)
     
     while(e != NULL)  {
         if(e->header.used == 0) {
-            mon_p->cnt_free++;
-            mon_p->size_free += e->header.d_size;
-            if(e->header.d_size > mon_p->size_free_big) {
-                mon_p->size_free_big = e->header.d_size;
+            mon_p->free_cnt++;
+            mon_p->free_size += e->header.d_size;
+            if(e->header.d_size > mon_p->free_biggest_size) {
+                mon_p->free_biggest_size = e->header.d_size;
             }
         } else {
-            mon_p->cnt_used++;
+            mon_p->used_cnt++;
         }
         
         e = ent_get_next(e);
     }
-    mon_p->size_total = DM_MEM_SIZE;
-    mon_p->pct_used = 100 - (100U * mon_p->size_free) / mon_p->size_total;
-    mon_p->pct_frag = (uint32_t)mon_p->size_free_big * 100U / mon_p->size_free;
-    mon_p->pct_frag = 100 - mon_p->pct_frag;
+    mon_p->total_size = LV_MEM_SIZE;
+    mon_p->used_pct = 100 - (100U * mon_p->free_size) / mon_p->total_size;
+    mon_p->frag_pct = (uint32_t)mon_p->free_biggest_size * 100U / mon_p->free_size;
+    mon_p->frag_pct = 100 - mon_p->frag_pct;
 #endif
 }
 
@@ -290,7 +285,7 @@ uint32_t lv_mem_get_size(void * data)
  *   STATIC FUNCTIONS
  **********************/
 
-#if DM_CUSTOM == 0
+#if LV_MEM_CUSTOM == 0
 /**
  * Give the next entry after 'act_e'
  * @param act_e pointer to an entry
@@ -308,7 +303,7 @@ static lv_mem_ent_t * ent_get_next(lv_mem_ent_t * act_e)
         uint8_t * data = &act_e->first_data;
         next_e = (lv_mem_ent_t * )&data[act_e->header.d_size];
         
-        if(&next_e->first_data >= &work_mem[DM_MEM_SIZE]) next_e = NULL;
+        if(&next_e->first_data >= &work_mem[LV_MEM_SIZE]) next_e = NULL;
     }
     
     return next_e;
diff --git a/lv_misc/lv_mem.h b/lv_misc/lv_mem.h
index b57a47d0db..6c16e8d6a0 100644
--- a/lv_misc/lv_mem.h
+++ b/lv_misc/lv_mem.h
@@ -14,12 +14,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include <stdint.h>
 #include <stddef.h>
 
-
 /*********************
  *      DEFINES
  *********************/
@@ -30,15 +27,14 @@ extern "C" {
 
 typedef struct
 {
-    uint32_t cnt_free;
-    uint32_t cnt_used;
-    uint32_t size_free;
-    uint32_t size_total;
-    uint32_t size_free_big;
-    uint8_t pct_frag;
-    uint8_t pct_used;
-}dm_mon_t;
-
+    uint32_t free_cnt;
+    uint32_t used_cnt;
+    uint32_t free_size;
+    uint32_t total_size;
+    uint32_t free_biggest_size;
+    uint8_t frag_pct;
+    uint8_t used_pct;
+}lv_mem_monitor_t;
 
 /**********************
  * GLOBAL PROTOTYPES
@@ -82,7 +78,7 @@ void lv_mem_defrag(void);
  * @param mon_p pointer to a dm_mon_p variable,
  *              the result of the analysis will be stored here
  */
-void lv_mem_monitor(dm_mon_t * mon_p);
+void lv_mem_monitor(lv_mem_monitor_t * mon_p);
 
 /**
  * Give the size of an allocated memory
@@ -91,11 +87,22 @@ void lv_mem_monitor(dm_mon_t * mon_p);
  */
 uint32_t lv_mem_get_size(void * data);
 
+
+/**
+ * Halt o NULL pointer
+ * p pointer to a memory
+ */
+static inline  void lv_mem_assert(void *p)
+{
+    if(p == NULL) {while(1);}
+}
+
+
 /**********************
  *      MACROS
  **********************/
 
-#define dm_assert(p) {if(p == NULL) {while(1);}}
+
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/lv_misc/lv_task.c b/lv_misc/lv_task.c
index 9fb8671037..509e098ac8 100644
--- a/lv_misc/lv_task.c
+++ b/lv_misc/lv_task.c
@@ -7,11 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
+#include <stddef.h>
 #include "lv_task.h"
 #include "../lv_hal/lv_hal_tick.h"
-#include <stddef.h>
 
 /*********************
  *      DEFINES
@@ -117,14 +115,14 @@ lv_task_t* lv_task_create(void (*task) (void *), uint32_t period, lv_task_prio_t
     lv_task_t* new_lv_task;
     
     new_lv_task = lv_ll_ins_head(&lv_task_ll);
-    dm_assert(new_lv_task);
+    lv_mem_assert(new_lv_task);
     
     new_lv_task->period = period;
     new_lv_task->task = task;
     new_lv_task->prio = prio;
     new_lv_task->param = param;
     new_lv_task->once = 0;
-    new_lv_task->last_run = MISC_SYSTICK_GET();
+    new_lv_task->last_run = lv_tick_get();
 
     return new_lv_task;
 }
@@ -166,7 +164,7 @@ void lv_task_set_period(lv_task_t* lv_task_p, uint32_t period)
  */
 void lv_task_ready(lv_task_t* lv_task_p)
 {
-    lv_task_p->last_run = MISC_SYSTICK_GET() - lv_task_p->period - 1;
+    lv_task_p->last_run = lv_tick_get() - lv_task_p->period - 1;
 }
 
 /**
@@ -185,7 +183,7 @@ void lv_task_once(lv_task_t * lv_task_p)
  */
 void lv_task_reset(lv_task_t* lv_task_p)
 {
-    lv_task_p->last_run = MISC_SYSTICK_GET();
+    lv_task_p->last_run = lv_tick_get();
 }
 
 /**
@@ -224,9 +222,9 @@ static bool lv_task_exec (lv_task_t* lv_task_p, lv_task_prio_t prio_act)
     /*Execute lv_task if its prio is 'prio_act'*/
     if(lv_task_p->prio == prio_act) {
         /*Execute if at least 'period' time elapsed*/
-        uint32_t elp = MISC_SYSTICK_ELAPS(lv_task_p->last_run);
+        uint32_t elp = lv_tick_elaps(lv_task_p->last_run);
         if(elp >= lv_task_p->period) {
-            lv_task_p->last_run = MISC_SYSTICK_GET();
+            lv_task_p->last_run = lv_tick_get();
             lv_task_p->task(lv_task_p->param);
 
             /*Delete if it was a one shot lv_task*/
diff --git a/lv_misc/lv_task.h b/lv_misc/lv_task.h
index 196b3eb572..4f5a259d73 100644
--- a/lv_misc/lv_task.h
+++ b/lv_misc/lv_task.h
@@ -14,8 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_mem.h"
diff --git a/lv_misc/lv_trigo.c b/lv_misc/lv_trigo.c
index 8f41f3426b..59d908d266 100644
--- a/lv_misc/lv_trigo.c
+++ b/lv_misc/lv_trigo.c
@@ -7,8 +7,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include "lv_trigo.h"
 
 /*********************
diff --git a/lv_misc/lv_trigo.h b/lv_misc/lv_trigo.h
index 6e5c88efbd..3620a318f3 100644
--- a/lv_misc/lv_trigo.h
+++ b/lv_misc/lv_trigo.h
@@ -14,9 +14,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-#if USE_TRIGO != 0
-
 #include <stdint.h>
 
 /*********************
@@ -43,8 +40,6 @@ int16_t lv_trigo_sin(int16_t angle);
  *      MACROS
  **********************/
 
-#endif /*USE_TRIGO*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/lv_misc/lv_txt.c b/lv_misc/lv_txt.c
index aac00e6db4..33d0aa2bdd 100644
--- a/lv_misc/lv_txt.c
+++ b/lv_misc/lv_txt.c
@@ -6,9 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include <lvgl/lv_misc/lv_txt.h>
-#include "misc_conf.h"
-
+#include "lv_txt.h"
+#include "lv_conf.h"
 #include "lv_math.h"
 
 /*********************
@@ -436,7 +435,7 @@ uint32_t lv_txt_utf8_prev(const char * txt, uint32_t * i)
     if(i == NULL) return *(txt- 1);    /*Get the prev. char */
 
     (*i)--;
-    uint8_t letter = txt[*i)] ;
+    uint8_t letter = txt[*i] ;
 
     return letter;
 #else
@@ -549,8 +548,8 @@ static bool is_break_char(uint32_t letter)
     bool ret = false;
     
     /*Compare the letter to TXT_BREAK_CHARS*/
-    for(i = 0; TXT_BREAK_CHARS[i] != '\0'; i++) {
-        if(letter == TXT_BREAK_CHARS[i]) {
+    for(i = 0; LV_TXT_BREAK_CHARS[i] != '\0'; i++) {
+        if(letter == LV_TXT_BREAK_CHARS[i]) {
             ret = true; /*If match then it is break char*/
             break;
         }
diff --git a/lv_misc/lv_txt.h b/lv_misc/lv_txt.h
index e01d3f8293..e38ebcd634 100644
--- a/lv_misc/lv_txt.h
+++ b/lv_misc/lv_txt.h
@@ -3,8 +3,8 @@
  * 
  */
 
-#ifndef LV_TEXT_H
-#define LV_TEXT_H
+#ifndef LV_TXT_H
+#define LV_TXT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,8 +13,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include <stdbool.h>
 #include "lv_area.h"
 #include "lv_font.h"
diff --git a/lv_misc/lv_ufs.c b/lv_misc/lv_ufs.c
index d4afd5e317..b4bd28cc6b 100644
--- a/lv_misc/lv_ufs.c
+++ b/lv_misc/lv_ufs.c
@@ -7,14 +7,12 @@
 /*********************
  *      INCLUDES
  *********************/
-
-#include "misc_conf.h"
-
+#include "lv_conf.h"
+#include "lv_ufs.h"
+#include "lv_ll.h"
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "lv_ufs.h"
-#include "lv_ll.h"
 
 /*********************
  *      DEFINES
@@ -441,12 +439,16 @@ lv_fs_res_t lv_ufs_readdir_close(void * rddir_p)
  */
 lv_fs_res_t lv_ufs_free (uint32_t * total_p, uint32_t * free_p)
 {
-    dm_mon_t mon;
+
+#if LV_MEM_CUSTOM == 0
+    lv_mem_monitor_t mon;
 
     lv_mem_monitor(&mon);
-    *total_p = DM_MEM_SIZE >> 10;    /*Convert bytes to kB*/
-    *free_p = mon.size_free >> 10;
-
+    *total_p = LV_MEM_SIZE >> 10;    /*Convert bytes to kB*/
+    *free_p = mon.free_size >> 10;
+#else
+    *free_p = 0;
+#endif
     return FS_RES_OK;
 }
 
diff --git a/lv_misc/lv_ufs.h b/lv_misc/lv_ufs.h
index 33469bd963..d5167cea8e 100644
--- a/lv_misc/lv_ufs.h
+++ b/lv_misc/lv_ufs.h
@@ -15,8 +15,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-
 #include <stdbool.h>
 #include "lv_fs.h"
 #include "lv_mem.h"
@@ -24,6 +22,7 @@ extern "C" {
 /*********************
  *      DEFINES
  *********************/
+#define UFS_LETTER 'U'
 
 /**********************
  *      TYPEDEFS
diff --git a/lv_obj/lv_obj.c b/lv_obj/lv_obj.c
index 27099e389a..6a980c85c8 100644
--- a/lv_obj/lv_obj.c
+++ b/lv_obj/lv_obj.c
@@ -10,12 +10,14 @@
 #include "lv_conf.h"
 #include "lv_obj.h"
 #include "lv_indev.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_draw/lv_draw_rbasic.h"
 #include "lv_refr.h"
 #include "lv_group.h"
-#include "misc/misc.h"
+#include "../lv_draw/lv_draw.h"
+#include "../lv_draw/lv_draw_rbasic.h"
 #include "../lv_misc/lv_anim.h"
+#include "../lv_misc/lv_task.h"
+#include "../lv_misc/lv_fs.h"
+#include "../lv_misc/lv_ufs.h"
 #include <stdint.h>
 #include <string.h>
 
@@ -33,7 +35,7 @@
  *  STATIC PROTOTYPES
  **********************/
 static void refresh_childen_position(lv_obj_t * obj, lv_coord_t x_diff, lv_coord_t y_diff);
-static void lv_obj_report_style_mod_core(void * style_p, lv_obj_t * obj);
+static void report_style_mod_core(void * style_p, lv_obj_t * obj);
 static void refresh_childen_style(lv_obj_t * obj);
 static void delete_children(lv_obj_t * obj);
 static bool lv_obj_design(lv_obj_t * obj, const  lv_area_t * mask_p, lv_design_mode_t mode);
@@ -61,32 +63,13 @@ static lv_ll_t scr_ll;                 /*Linked list of screens*/
  */
 void lv_init(void)
 {
-    /*Initialize misc. library. (Protected against re-initialization)*/
-    misc_init();
-
-#if USE_DYN_MEM != 0
+    /*Initialize the lv_misc modules*/
     lv_mem_init();
-#endif
-
-#if USE_LV_TASK != 0
     lv_task_init();
-#endif
-
-#if USE_FSINT != 0  /*Init is befor other FS inits*/
     lv_fs_init();
-#endif
-
-#if USE_UFS != 0
     lv_ufs_init();
-#endif
-
-#if USE_FONT != 0
     lv_font_init();
-#endif
-
-#if USE_ANIM != 0
     lv_anim_init();
-#endif
 
     /*Clear the screen*/
     lv_area_t scr_area;
@@ -756,7 +739,7 @@ void lv_obj_report_style_mod(void * style)
 {
     lv_obj_t * i;
     LL_READ(scr_ll, i) {
-        lv_obj_report_style_mod_core(style, i);
+        report_style_mod_core(style, i);
     }
 }
 
@@ -1493,7 +1476,7 @@ static void refresh_childen_position(lv_obj_t * obj, lv_coord_t x_diff, lv_coord
  * @param style_p refresh objects only with this style. (ignore is if NULL)
  * @param obj pointer to an object
  */
-static void lv_obj_report_style_mod_core(void * style_p, lv_obj_t * obj)
+static void report_style_mod_core(void * style_p, lv_obj_t * obj)
 {
     lv_obj_t * i;
     LL_READ(obj->child_ll, i) {
@@ -1502,7 +1485,7 @@ static void lv_obj_report_style_mod_core(void * style_p, lv_obj_t * obj)
             lv_obj_refresh_style(i);
         }
         
-        lv_obj_report_style_mod_core(style_p, i);
+        report_style_mod_core(style_p, i);
     }
 }
 
diff --git a/lv_obj/lv_refr.c b/lv_obj/lv_refr.c
index 476128aaee..0d58a9b541 100644
--- a/lv_obj/lv_refr.c
+++ b/lv_obj/lv_refr.c
@@ -69,7 +69,7 @@ void lv_refr_init(void)
 
     lv_task_t* task;
     task = lv_task_create(lv_refr_task, LV_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
-    dm_assert(task);
+    lv_mem_assert(task);
 }
 
 /**
diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c
index 3677e19411..bf102df371 100644
--- a/lv_objx/lv_bar.c
+++ b/lv_objx/lv_bar.c
@@ -55,14 +55,14 @@ lv_obj_t * lv_bar_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor basic object*/
     lv_obj_t * new_bar = lv_obj_create(par, copy);
-    dm_assert(new_bar);
+    lv_mem_assert(new_bar);
 
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_bar);
     if(ancestor_design_f == NULL) ancestor_design_f = lv_obj_get_design_func(new_bar);
 
     /*Allocate the object type specific extended data*/
     lv_bar_ext_t * ext = lv_obj_allocate_ext_attr(new_bar, sizeof(lv_bar_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->min_value = 0;
     ext->max_value = 100;
     ext->cur_value = 0;
diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c
index 44e08db07c..0f74b88bc2 100644
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -55,12 +55,12 @@ lv_obj_t * lv_btn_create(lv_obj_t * par, lv_obj_t * copy)
     lv_obj_t * new_btn;
     
     new_btn = lv_cont_create(par, copy);
-    dm_assert(new_btn);
+    lv_mem_assert(new_btn);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_btn);
 
     /*Allocate the extended data*/
     lv_btn_ext_t * ext = lv_obj_allocate_ext_attr(new_btn, sizeof(lv_btn_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->state = LV_BTN_STATE_REL;
 
     ext->actions[LV_BTN_ACTION_PR] = NULL;
diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index a1a5cded62..2af03d55be 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -66,12 +66,12 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor object*/
     lv_obj_t * new_btnm = lv_obj_create(par, copy);
-    dm_assert(new_btnm);
+    lv_mem_assert(new_btnm);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_btnm);
     
     /*Allocate the object type specific extended data*/
     lv_btnm_ext_t * ext = lv_obj_allocate_ext_attr(new_btnm, sizeof(lv_btnm_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->btn_cnt = 0;
     ext->btn_id_pr = LV_BTNM_PR_NONE;
     ext->btn_id_tgl = LV_BTNM_PR_NONE;
diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c
index faac2865a3..ef64835414 100644
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -53,12 +53,12 @@ lv_obj_t * lv_cb_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor basic object*/
     lv_obj_t * new_cb = lv_btn_create(par, copy);
-    dm_assert(new_cb);
+    lv_mem_assert(new_cb);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_cb);
     if(ancestor_bg_design == NULL) ancestor_bg_design = lv_obj_get_design_func(new_cb);
     
     lv_cb_ext_t * ext = lv_obj_allocate_ext_attr(new_cb, sizeof(lv_cb_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->bullet = NULL;
     ext->label = NULL;
 
diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c
index 7fe8880318..67b3d8cd6f 100644
--- a/lv_objx/lv_chart.c
+++ b/lv_objx/lv_chart.c
@@ -60,11 +60,11 @@ lv_obj_t * lv_chart_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor basic object*/
     lv_obj_t * new_chart = lv_obj_create(par, copy);
-    dm_assert(new_chart);
+    lv_mem_assert(new_chart);
 
     /*Allocate the object type specific extended data*/
     lv_chart_ext_t * ext = lv_obj_allocate_ext_attr(new_chart, sizeof(lv_chart_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     lv_ll_init(&ext->series_ll, sizeof(lv_chart_series_t));
     ext->series.num = 0;
     ext->ymin = LV_CHART_YMIN_DEF;
diff --git a/lv_objx/lv_cont.c b/lv_objx/lv_cont.c
index ed5096c255..267cb2c03e 100644
--- a/lv_objx/lv_cont.c
+++ b/lv_objx/lv_cont.c
@@ -65,12 +65,12 @@ lv_obj_t * lv_cont_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create a basic object*/
     lv_obj_t * new_cont = lv_obj_create(par, copy);
-    dm_assert(new_cont);
+    lv_mem_assert(new_cont);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_cont);
 
     lv_obj_allocate_ext_attr(new_cont, sizeof(lv_cont_ext_t));
     lv_cont_ext_t * ext = lv_obj_get_ext_attr(new_cont);
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->hor_fit = 0;
     ext->ver_fit = 0;
     ext->layout = LV_LAYOUT_OFF;
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index 2b6c5f50df..63a07f4cc9 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -61,14 +61,14 @@ lv_obj_t * lv_ddlist_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor drop down list*/
     lv_obj_t * new_ddlist = lv_page_create(par, copy);
-    dm_assert(new_ddlist);
+    lv_mem_assert(new_ddlist);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_ddlist);
     if(ancestor_scrl_signal == NULL) ancestor_scrl_signal = lv_obj_get_signal_func(lv_page_get_scrl(new_ddlist));
     if(ancestor_design == NULL) ancestor_design = lv_obj_get_design_func(new_ddlist);
     
     /*Allocate the drop down list type specific extended data*/
     lv_ddlist_ext_t * ext = lv_obj_allocate_ext_attr(new_ddlist, sizeof(lv_ddlist_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
     ext->label = NULL;
diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c
index 1068757c45..ed0659e1a3 100644
--- a/lv_objx/lv_gauge.c
+++ b/lv_objx/lv_gauge.c
@@ -13,7 +13,7 @@
 #include "lv_gauge.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include <lvgl/lv_misc/lv_txt.h>
+#include "../lv_misc/lv_txt.h"
 #include "../lv_misc/lv_trigo.h"
 #include "../lv_misc/lv_math.h"
 #include <stdio.h>
@@ -64,11 +64,11 @@ lv_obj_t * lv_gauge_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor gauge*/
     lv_obj_t * new_gauge = lv_lmeter_create(par, copy);
-    dm_assert(new_gauge);
+    lv_mem_assert(new_gauge);
     
     /*Allocate the gauge type specific extended data*/
     lv_gauge_ext_t * ext = lv_obj_allocate_ext_attr(new_gauge, sizeof(lv_gauge_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
     ext->needle_count = 0;
diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h
index 745f3f9aac..ae845697ac 100644
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -14,7 +14,6 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_conf.h"
-#include "misc_conf.h"
 #if USE_LV_GAUGE != 0
 
 /*Testing of dependencies*/
@@ -22,11 +21,6 @@ extern "C" {
 #error "lv_gauge: lv_lmeter is required. Enable it in lv_conf.h (USE_LV_LMETER  1) "
 #endif
 
-#if USE_TRIGO == 0
-#error "lv_gauge: trigo is required. Enable it in misc_conf.h (USE_TRIGO  1) "
-#endif
-
-
 #include "../lv_obj/lv_obj.h"
 #include "lv_lmeter.h"
 #include "lv_label.h"
diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c
index b78fb53b59..7e8c141cf4 100644
--- a/lv_objx/lv_img.c
+++ b/lv_objx/lv_img.c
@@ -7,15 +7,14 @@
  *      INCLUDES
  *********************/
 #include "lv_conf.h"
-#include "misc_conf.h"
-#if USE_LV_IMG != 0 && USE_FSINT != 0
+#if USE_LV_IMG != 0
 
 #include "lv_img.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_ufs.h"
-#include <lvgl/lv_misc/lv_txt.h>
+#include "../lv_misc/lv_txt.h"
 
 /*********************
  *      DEFINES
@@ -57,12 +56,12 @@ lv_obj_t * lv_img_create(lv_obj_t * par, lv_obj_t * copy)
     
     /*Create a basic object*/
     new_img = lv_obj_create(par, copy);
-    dm_assert(new_img);
+    lv_mem_assert(new_img);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_img);
     
     /*Extend the basic object to image object*/
     lv_img_ext_t * ext = lv_obj_allocate_ext_attr(new_img, sizeof(lv_img_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->fn = NULL;
     ext->w = lv_obj_get_width(new_img);
     ext->h = lv_obj_get_height(new_img);
@@ -103,15 +102,11 @@ lv_obj_t * lv_img_create(lv_obj_t * par, lv_obj_t * copy)
  */
 lv_fs_res_t lv_img_create_file(const char * fn, const color_int_t * data)
 {
-#if USE_UFS != 0
 	const lv_img_raw_header_t * raw_p = (lv_img_raw_header_t *) data;
 	lv_fs_res_t res;
 	res = lv_ufs_create_const(fn, data, raw_p->w * raw_p->h * sizeof(lv_color_t) + sizeof(lv_img_raw_header_t));
 
 	return res;
-#else
-	return FS_RES_NOT_EX;
-#endif
 }
 
 /*=====================
diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h
index 3b6abf9c8f..a265749d8d 100644
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -14,20 +14,12 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_conf.h"
-#include "misc_conf.h"
-#if USE_LV_IMG != 0 && USE_FSINT != 0
+#if USE_LV_IMG != 0
 
 #include "../lv_obj/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
-
-#ifndef LV_IMG_ENABLE_SYMBOLS
-#define LV_IMG_ENABLE_SYMBOLS 0
-#endif
-
-#if LV_IMG_ENABLE_SYMBOLS != 0
-#include "lv_label.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
-#endif
+#include "lv_label.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_kb.c b/lv_objx/lv_kb.c
index 4ebe39b7f4..2eeb49a60d 100644
--- a/lv_objx/lv_kb.c
+++ b/lv_objx/lv_kb.c
@@ -78,12 +78,12 @@ lv_obj_t * lv_kb_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor of keyboard*/
     lv_obj_t * new_kb = lv_btnm_create(par, copy);
-    dm_assert(new_kb);
+    lv_mem_assert(new_kb);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_kb);
     
     /*Allocate the keyboard type specific extended data*/
     lv_kb_ext_t * ext = lv_obj_allocate_ext_attr(new_kb, sizeof(lv_kb_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
 
diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c
index 3614d3b798..378a17e315 100644
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -68,14 +68,14 @@ lv_obj_t * lv_label_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create a basic object*/
     lv_obj_t * new_label = lv_obj_create(par, copy);
-    dm_assert(new_label);
+    lv_mem_assert(new_label);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_label);
     
     /*Extend the basic object to a label object*/
     lv_obj_allocate_ext_attr(new_label, sizeof(lv_label_ext_t));
     
     lv_label_ext_t * ext = lv_obj_get_ext_attr(new_label);
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->text = NULL;
     ext->static_txt = 0;
     ext->recolor = 0;
diff --git a/lv_objx/lv_led.c b/lv_objx/lv_led.c
index 72aa95ce05..15e90509c0 100644
--- a/lv_objx/lv_led.c
+++ b/lv_objx/lv_led.c
@@ -55,13 +55,13 @@ lv_obj_t * lv_led_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor basic object*/
 	lv_obj_t * new_led = lv_obj_create(par, copy);
-    dm_assert(new_led);
+    lv_mem_assert(new_led);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_led);
     if(ancestor_design_f == NULL) ancestor_design_f = lv_obj_get_design_func(new_led);
     
     /*Allocate the object type specific extended data*/
     lv_led_ext_t * ext = lv_obj_allocate_ext_attr(new_led, sizeof(lv_led_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->bright = LV_LED_BRIGHT_ON;
 
     lv_obj_set_signal_func(new_led, lv_led_signal);
diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c
index 153275a31c..5988b0d435 100644
--- a/lv_objx/lv_line.c
+++ b/lv_objx/lv_line.c
@@ -53,12 +53,12 @@ lv_obj_t * lv_line_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create a basic object*/
     lv_obj_t * new_line = lv_obj_create(par, copy);
-    dm_assert(new_line);
+    lv_mem_assert(new_line);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_line);
 
     /*Extend the basic object to line object*/
     lv_line_ext_t * ext = lv_obj_allocate_ext_attr(new_line, sizeof(lv_line_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->point_num = 0;
     ext->point_array = NULL;
     ext->auto_size = 1;
diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c
index 04152a3db1..f7a0ced0d8 100644
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -60,11 +60,11 @@ lv_obj_t * lv_list_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor basic object*/
     lv_obj_t * new_list = lv_page_create(par, copy);
-    dm_assert(new_list);
+    lv_mem_assert(new_list);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_list);
 
     lv_list_ext_t * ext = lv_obj_allocate_ext_attr(new_list, sizeof(lv_list_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     ext->style_img = NULL;
     ext->styles_btn[LV_BTN_STATE_REL] = &lv_style_btn_rel;
diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c
index af98953544..819c37e496 100644
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -52,12 +52,12 @@ lv_obj_t * lv_lmeter_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor of line meter*/
     lv_obj_t * new_lmeter = lv_obj_create(par, copy);
-    dm_assert(new_lmeter);
+    lv_mem_assert(new_lmeter);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_lmeter);
     
     /*Allocate the line meter type specific extended data*/
     lv_lmeter_ext_t * ext = lv_obj_allocate_ext_attr(new_lmeter, sizeof(lv_lmeter_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
     ext->min_value = 0;
diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h
index 5236018852..52daad1435 100644
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -14,15 +14,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_conf.h"
-#include "misc_conf.h"
 #if USE_LV_LMETER != 0
 
-/*Testing of dependencies*/
-#if USE_TRIGO == 0
-#error "lv_lmeter: trigo is required. Enable it in misc_conf.h (USE_TRIGO  1) "
-#endif
-
-
 #include "../lv_obj/lv_obj.h"
 
 /*********************
diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c
index d528744123..bd30cf5b15 100644
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -55,12 +55,12 @@ lv_obj_t * lv_mbox_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor message box*/
 	lv_obj_t * new_mbox = lv_cont_create(par, copy);
-    dm_assert(new_mbox);
+    lv_mem_assert(new_mbox);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_mbox);
     
     /*Allocate the message box type specific extended data*/
     lv_mbox_ext_t * ext = lv_obj_allocate_ext_attr(new_mbox, sizeof(lv_mbox_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->text = NULL;
     ext->btnm = NULL;
     ext->anim_time = LV_MBOX_CLOSE_ANIM_TIME;
diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c
index 82fb3d4a47..3a84f17d05 100644
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -59,13 +59,13 @@ lv_obj_t * lv_page_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor object*/
     lv_obj_t * new_page = lv_cont_create(par, copy);
-    dm_assert(new_page);
+    lv_mem_assert(new_page);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_page);
     if(ancestor_design == NULL) ancestor_design = lv_obj_get_design_func(new_page);
 
     /*Allocate the object type specific extended data*/
     lv_page_ext_t * ext = lv_obj_allocate_ext_attr(new_page, sizeof(lv_page_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->scrl = NULL;
     ext->pr_action = NULL;
     ext->rel_action = NULL;
diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c
index 731e5ab53e..5b5311f6bf 100644
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -55,13 +55,13 @@ lv_obj_t * lv_roller_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor of roller*/
 	lv_obj_t * new_roller = lv_ddlist_create(par, copy);
-    dm_assert(new_roller);
+    lv_mem_assert(new_roller);
     if(ancestor_scrl_signal == NULL) ancestor_scrl_signal = lv_obj_get_signal_func(lv_page_get_scrl(new_roller));
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_roller);
     
     /*Allocate the roller type specific extended data*/
     lv_roller_ext_t * ext = lv_obj_allocate_ext_attr(new_roller, sizeof(lv_roller_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*The signal and design functions are not copied so set them here*/
     lv_obj_set_signal_func(new_roller, lv_roller_signal);
diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c
index d9ce29945e..9764537d9e 100644
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -55,14 +55,14 @@ lv_obj_t * lv_slider_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor slider*/
     lv_obj_t * new_slider = lv_bar_create(par, copy);
-    dm_assert(new_slider);
+    lv_mem_assert(new_slider);
     
     if(ancestor_design_f == NULL) ancestor_design_f = lv_obj_get_design_func(new_slider);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_slider);
 
     /*Allocate the slider type specific extended data*/
     lv_slider_ext_t * ext = lv_obj_allocate_ext_attr(new_slider, sizeof(lv_slider_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
     ext->action = NULL;
diff --git a/lv_objx/lv_sw.c b/lv_objx/lv_sw.c
index 2557760f62..e7ac05f552 100644
--- a/lv_objx/lv_sw.c
+++ b/lv_objx/lv_sw.c
@@ -48,13 +48,13 @@ lv_obj_t * lv_sw_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor of switch*/
     lv_obj_t * new_sw = lv_slider_create(par, copy);
-    dm_assert(new_sw);
+    lv_mem_assert(new_sw);
 
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_sw);
     
     /*Allocate the switch type specific extended data*/
     lv_sw_ext_t * ext = lv_obj_allocate_ext_attr(new_sw, sizeof(lv_sw_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
     ext->changed = 0;
diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c
index 8f3f2b36ed..d282e26ec2 100644
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -75,7 +75,7 @@ lv_obj_t * lv_ta_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor object*/
     lv_obj_t * new_ta = lv_page_create(par, copy);
-    dm_assert(new_ta);
+    lv_mem_assert(new_ta);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_ta);
     if(ancestor_design == NULL) ancestor_design = lv_obj_get_design_func(new_ta);
     if(scrl_signal == NULL) scrl_signal = lv_obj_get_signal_func(lv_page_get_scrl(new_ta));
@@ -83,7 +83,7 @@ lv_obj_t * lv_ta_create(lv_obj_t * par, lv_obj_t * copy)
 
     /*Allocate the object type specific extended data*/
     lv_ta_ext_t * ext = lv_obj_allocate_ext_attr(new_ta, sizeof(lv_ta_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->cursor.state = 0;
     ext->pwd_mode = 0;
     ext->pwd_tmp = NULL;
@@ -180,7 +180,7 @@ void lv_ta_add_char(lv_obj_t * ta, char c)
     if(ext->pwd_mode != 0) {
 
         ext->pwd_tmp = lv_mem_realloc(ext->pwd_tmp, strlen(ext->pwd_tmp) + 2);  /*+2: the new char + \0 */
-        dm_assert(ext->pwd_tmp);
+        lv_mem_assert(ext->pwd_tmp);
         lv_txt_ins(ext->pwd_tmp, ext->cursor.pos, letter_buf);
 
         lv_anim_t a;
@@ -219,7 +219,7 @@ void lv_ta_add_text(lv_obj_t * ta, const char * txt)
     lv_label_ins_text(ext->label, ext->cursor.pos, txt);
     if(ext->pwd_mode != 0) {
         ext->pwd_tmp = lv_mem_realloc(ext->pwd_tmp, strlen(ext->pwd_tmp) + strlen(txt) + 1);
-        dm_assert(ext->pwd_tmp);
+        lv_mem_assert(ext->pwd_tmp);
 
         lv_txt_ins(ext->pwd_tmp, ext->cursor.pos, txt);
 
@@ -274,7 +274,7 @@ void lv_ta_del_char(lv_obj_t * ta)
         lv_txt_cut(ext->pwd_tmp, ext->cursor.pos - 1, lv_txt_utf8_size(label_txt[byte_pos]));
 #endif
         ext->pwd_tmp = lv_mem_realloc(ext->pwd_tmp, strlen(ext->pwd_tmp) + 1);
-        dm_assert(ext->pwd_tmp);
+        lv_mem_assert(ext->pwd_tmp);
     }
 
     /*Move the cursor to the place of the deleted character*/
diff --git a/lv_objx/lv_tabview.c b/lv_objx/lv_tabview.c
index 49bec5873b..072585b918 100644
--- a/lv_objx/lv_tabview.c
+++ b/lv_objx/lv_tabview.c
@@ -61,12 +61,12 @@ lv_obj_t * lv_tabview_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor of tab*/
     lv_obj_t * new_tabview = lv_obj_create(par, copy);
-    dm_assert(new_tabview);
+    lv_mem_assert(new_tabview);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_tabview);
     
     /*Allocate the tab type specific extended data*/
     lv_tabview_ext_t * ext = lv_obj_allocate_ext_attr(new_tabview, sizeof(lv_tabview_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
 
     /*Initialize the allocated 'ext' */
     ext->drag_hor = 0;
diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c
index 811b540035..f12e8362a4 100644
--- a/lv_objx/lv_win.c
+++ b/lv_objx/lv_win.c
@@ -49,12 +49,12 @@ lv_obj_t * lv_win_create(lv_obj_t * par, lv_obj_t * copy)
 {
     /*Create the ancestor object*/
     lv_obj_t * new_win = lv_obj_create(par, copy);
-    dm_assert(new_win);
+    lv_mem_assert(new_win);
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_win);
     
     /*Allocate the object type specific extended data*/
     lv_win_ext_t * ext = lv_obj_allocate_ext_attr(new_win, sizeof(lv_win_ext_t));
-    dm_assert(ext);
+    lv_mem_assert(ext);
     ext->page = NULL;
     ext->header = NULL;
     ext->title = NULL;
diff --git a/lvgl.h b/lvgl.h
index 009d873578..20e50bdd5f 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -15,7 +15,6 @@ extern "C" {
  *********************/
 
 /*Test misc. module version*/
-#include "misc/misc.h"
 #include "lv_misc/lv_task.h"
 
 #include "lv_hal/lv_hal.h"
@@ -59,15 +58,6 @@ extern "C" {
 #define LVGL_VERSION_PATH   0
 #define LVGL_VERSION_INFO   "beta"
 
-/*Required misc. library version*/
-#define LV_MISC_REQ_MAJOR   5
-#define LV_MISC_REQ_MINOR   0
-#define LV_MISC_REQ_PATCH   0
-
-#if MISC_VERSION_MAJOR != LV_MISC_REQ_MAJOR /*The version major has to match*/
-#error "LV: incompatible misc. module version! See lvgl.h"
-#endif
-
 #if MISC_VERSION_MINOR < LV_MISC_REQ_MINOR /*The version minor has to be the same or greater*/
 #error "LV: incompatible misc. module version! See lvgl.h"
 #endif