diff --git a/app/Makefile b/app/Makefile
index fbc69d78..87331c24 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -21,24 +21,24 @@ ifndef PDIR # {
 GEN_IMAGES= eagle.app.v6.out
 GEN_BINS= eagle.app.v6.bin
 SPECIAL_MKTARGETS=$(APP_MKTARGETS)
-SUBDIRS= 		\
-	user 		\
-	driver 		\
-	lwip 		\
-	json 		\
-	upgrade 	\
-	platform 	\
-	libc 		\
-	lua 		\
-	coap 		\
-	mqtt 		\
-	u8glib 		\
-	smart 		\
-	wofs 		\
-	modules 	\
-	spiffs 		\
-	cjson 		\
-	crypto 		\
+SUBDIRS= 					\
+	user 					\
+	driver 					\
+	lwip 					\
+	json 					\
+	upgrade 				\
+	platform 				\
+	libc 					\
+	lua 					\
+	coap 					\
+	mqtt 					\
+	u8glib 					\
+	smart 					\
+	wofs 					\
+	modules 				\
+	spiffs 					\
+	cjson 					\
+	crypto 					\
 	dhtlib
 
 endif # } PDIR
@@ -48,10 +48,10 @@ LDDIR = ../ld
 
 CCFLAGS += -Os
 
-TARGET_LDFLAGS = 			\
+TARGET_LDFLAGS = 				\
 	-nostdlib 				\
 	-Wl,-EL 				\
-	--longcalls 			\
+	--longcalls 				\
 	--text-section-literals
 
 ifeq ($(FLAVOR),debug)
@@ -72,13 +72,13 @@ ifeq ($(APP), 2)
 	LD_FILE = $(LDDIR)/eagle.app.v6.app2.ld
 endif
 
-COMPONENTS_eagle.app.v6 = 		\
+COMPONENTS_eagle.app.v6 = 			\
 	user/libuser.a 				\
 	driver/libdriver.a 			\
 	lwip/liblwip.a 				\
 	json/libjson.a 				\
-	upgrade/libupgrade.a 		\
-	platform/libplatform.a 		\
+	upgrade/libupgrade.a 			\
+	platform/libplatform.a 			\
 	libc/liblibc.a 				\
 	lua/liblua.a 				\
 	coap/coap.a 				\
@@ -92,33 +92,33 @@ COMPONENTS_eagle.app.v6 = 		\
 	dhtlib/libdhtlib.a 			\
 	modules/libmodules.a
 
-LINKFLAGS_eagle.app.v6 = 		\
-	-L../lib 					\
+LINKFLAGS_eagle.app.v6 = 			\
+	-L../lib 				\
 	-Wl,--gc-sections 			\
-	-Xlinker -Map=mapfile 		\
-	-nostdlib 					\
+	-Xlinker -Map=mapfile 			\
+	-nostdlib 				\
     -T$(LD_FILE) 				\
-	-Wl,--no-check-sections 	\
-    -u call_user_start 			\
+	-Wl,--no-check-sections 		\
+    -u call_user_start 				\
 	-Wl,-static 				\
 	-Wl,--start-group 			\
-	-lc 						\
-	-lgcc 						\
-	-lhal 						\
-	-lphy 						\
-	-lpp 						\
-	-lnet80211 					\
-	-lwpa 						\
-	-lmain 						\
-	-ljson 						\
+	-lc 					\
+	-lgcc 					\
+	-lhal 					\
+	-lphy 					\
+	-lpp 					\
+	-lnet80211 				\
+	-lwpa 					\
+	-lmain 					\
+	-ljson 					\
 	-lsmartconfig 				\
-	-lssl 						\
-	$(DEP_LIBS_eagle.app.v6) 	\
+	-lssl 					\
+	$(DEP_LIBS_eagle.app.v6) 		\
 	-Wl,--end-group 			\
 	-lm
 
-DEPENDS_eagle.app.v6 = 			\
-                $(LD_FILE) 		\
+DEPENDS_eagle.app.v6 = 				\
+                $(LD_FILE) 			\
                 $(LDDIR)/eagle.rom.addr.v6.ld
 
 #############################################################
@@ -129,24 +129,24 @@ DEPENDS_eagle.app.v6 = 			\
 #   for a subtree within the makefile rooted therein
 #
 
-#UNIVERSAL_TARGET_DEFINES = 		\
+#UNIVERSAL_TARGET_DEFINES = 			\
 
 # Other potential configuration flags include:
 #	-DTXRX_TXBUF_DEBUG
 #	-DTXRX_RXBUF_DEBUG
 #	-DWLAN_CONFIG_CCX
-CONFIGURATION_DEFINES =	-D__ets__ 	\
-			-DICACHE_FLASH 			\
-			-DLWIP_OPEN_SRC 		\
+CONFIGURATION_DEFINES =	-D__ets__ 		\
+			-DICACHE_FLASH 		\
+			-DLWIP_OPEN_SRC 	\
 			-DPBUF_RSV_FOR_WLAN 	\
 			-DEBUF_LWIP
 
-DEFINES += 							\
-	$(UNIVERSAL_TARGET_DEFINES) 	\
+DEFINES += 					\
+	$(UNIVERSAL_TARGET_DEFINES) 		\
 	$(CONFIGURATION_DEFINES)
 
-DDEFINES += 						\
-	$(UNIVERSAL_TARGET_DEFINES) 	\
+DDEFINES += 					\
+	$(UNIVERSAL_TARGET_DEFINES) 		\
 	$(CONFIGURATION_DEFINES)