diff --git a/jni/Android.mk b/jni/Android.mk
index ba3e83f..cdce1e0 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -24,22 +24,14 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \
 LOCAL_LDLIBS    := -llog -landroid
 
 ifeq ($(DEBUG),1)
-LOCAL_CFLAGS    :=  -D__PLATFORM__Android \
-                    -D__MODE__Touch \
-                    -DETK_DEBUG_LEVEL=3 \
-                    -DAPPL_DEBUG_LEVEL=3 \
+LOCAL_CFLAGS    :=  -D__MODE__Touch \
                     -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-                    -DBUILD_TIME="\"$(BUILD_TIME)\""
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 else
-LOCAL_CFLAGS    :=  -D__PLATFORM__Android \
-                    -D__MODE__Touch \
-                    -DETK_DEBUG_LEVEL=1 \
-                    -DAPPL_DEBUG_LEVEL=1 \
+LOCAL_CFLAGS    :=  -D__MODE__Touch \
                     -DMODE_RELEASE \
                     -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \
-                    -DBUILD_TIME="\"$(BUILD_TIME)\""
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 endif
 
 
diff --git a/jni/Linux.mk b/jni/Linux.mk
index be9ed81..3c07a1c 100644
--- a/jni/Linux.mk
+++ b/jni/Linux.mk
@@ -24,20 +24,12 @@ LOCAL_SRC_FILES := $(FILE_LIST)
 LOCAL_LDLIBS    := 
 
 ifeq ($(DEBUG),1)
-LOCAL_CFLAGS    :=  -D__PLATFORM__Linux \
-                    -DETK_DEBUG_LEVEL=3 \
-                    -DAPPL_DEBUG_LEVEL=3 \
-                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-                    -DBUILD_TIME="\"$(BUILD_TIME)\""
+LOCAL_CFLAGS    :=  -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 else
-LOCAL_CFLAGS    :=  -D__PLATFORM__Linux \
-                    -DETK_DEBUG_LEVEL=3 \
-                    -DAPPL_DEBUG_LEVEL=1 \
-                    -DMODE_RELEASE \
+LOCAL_CFLAGS    :=  -DMODE_RELEASE \
                     -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \
-                    -DBUILD_TIME="\"$(BUILD_TIME)\""
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 endif
 
 include $(BUILD_EXECUTABLE)
diff --git a/jni/appl/Debug.h b/jni/appl/Debug.h
index 10290b6..d0cb393 100644
--- a/jni/appl/Debug.h
+++ b/jni/appl/Debug.h
@@ -31,48 +31,14 @@
 
 extern const char * applLog;
 
-#define APPL_CRITICAL(data)         ETK_CRITICAL(applLog, data)
-// General 
-#if APPL_DEBUG_LEVEL > 0
-#	define APPL_WARNING(data)       ETK_WARNING(applLog, data)
-#	define APPL_ERROR(data)         ETK_ERROR(applLog, data)
-#else
-#	define APPL_WARNING(data)       do {}while(0)
-#	define APPL_ERROR(data)         do {}while(0)
-#endif
-
-#if APPL_DEBUG_LEVEL > 1
-#	define APPL_INFO(data)          ETK_INFO(applLog, data)
-#else
-#	define APPL_INFO(data)          do {}while(0)
-#endif
-
-#if APPL_DEBUG_LEVEL > 2
-#	define APPL_DEBUG(data)         ETK_DEBUG(applLog, data)
-#else
-#	define APPL_DEBUG(data)         do {}while(0)
-#endif
-
-#if APPL_DEBUG_LEVEL > 3
-#	define APPL_VERBOSE(data)         ETK_VERBOSE(applLog, data)
-#else
-#	define APPL_VERBOSE(data)         do {}while(0)
-#endif
-
-#define APPL_TODO(data)             ETK_WARNING(applLog, "TODO : " << data)
-
-#define APPL_ASSERT(cond, data)     ETK_ASSERT(applLog, cond, data)
-
-#if APPL_DEBUG_LEVEL > 1
-#	define APPL_CHECK_INOUT(cond)   ETK_CHECK_INOUT_ASSERT(applLog, cond)
-#elif APPL_DEBUG_LEVEL > 0
-#	define APPL_CHECK_INOUT(cond)   ETK_CHECK_INOUT_WARNING(applLog, cond)
-#else
-#	define APPL_CHECK_INOUT(cond)   do { } while (0)
-#endif
-
-
-
-
+#define APPL_CRITICAL(data)			ETK_CRITICAL(applLog, data)
+#define APPL_WARNING(data)			ETK_WARNING(applLog, data)
+#define APPL_ERROR(data)			ETK_ERROR(applLog, data)
+#define APPL_INFO(data)				ETK_INFO(applLog, data)
+#define APPL_DEBUG(data)			ETK_DEBUG(applLog, data)
+#define APPL_VERBOSE(data)			ETK_VERBOSE(applLog, data)
+#define APPL_ASSERT(cond, data)		ETK_ASSERT(applLog, cond, data)
+#define APPL_CHECK_INOUT(cond)		ETK_CHECK_INOUT(applLog, cond)
+#define APPL_TODO(cond)				ETK_TODO(applLog, cond)
 
 #endif
diff --git a/jni/appl/init.cpp b/jni/appl/init.cpp
index 0fd7155..3dce6ce 100644
--- a/jni/appl/init.cpp
+++ b/jni/appl/init.cpp
@@ -50,7 +50,7 @@ MainWindows * basicWindows = NULL;
  */
 void APP_Init(void)
 {
-	#ifdef __PLATFORM__Linux
+	#ifdef __TARGET_OS__Linux
 		#ifdef MODE_RELEASE
 			APPL_INFO("==> Init "PROJECT_NAME" (START) (Linux) (Release)");
 		#else
@@ -68,7 +68,7 @@ void APP_Init(void)
 
 	ewol::SetFontFolder("Font");
 	
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		ewol::SetDefaultFont("freefont/FreeSerif.ttf", 19);
 	#else
 		ewol::SetDefaultFont("freefont/FreeSerif.ttf", 14);