diff --git a/examples/elf/Kconfig b/examples/elf/Kconfig
index 4aaad727a..6f320e379 100644
--- a/examples/elf/Kconfig
+++ b/examples/elf/Kconfig
@@ -29,7 +29,7 @@ config EXAMPLES_ELF_ROMFS
 config EXAMPLES_ELF_CROMFS
 	bool "CROMFS"
 	depends on FS_CROMFS && BUILD_FLAT
-        ---help---
+	---help---
 		Automatically generates and mounts an internal CROMFS file
 		system
 
diff --git a/examples/modbusmaster/Kconfig b/examples/modbusmaster/Kconfig
index 157253e04..f02538291 100644
--- a/examples/modbusmaster/Kconfig
+++ b/examples/modbusmaster/Kconfig
@@ -48,11 +48,11 @@ config EXAMPLES_MODBUSMASTER_PARITY
 		0 = NONE ; 1 = ODD; 2 = EVEN
 
 config EXAMPLES_MODBUSMASTER_SLAVEADDR
-    int "Modbus Slave Address (master will query this slave)"
+	int "Modbus Slave Address (master will query this slave)"
 	default 1
 
 config EXAMPLES_MODBUSMASTER_SLAVEREG
-    int "Modbus Slave Holding Register address to query"
+	int "Modbus Slave Holding Register address to query"
 	default 1
 
 config EXAMPLES_MODBUSMASTER_TESTCOUNT
diff --git a/examples/module/Kconfig b/examples/module/Kconfig
index 3feee8fe7..8f6a29245 100644
--- a/examples/module/Kconfig
+++ b/examples/module/Kconfig
@@ -47,15 +47,15 @@ config EXAMPLES_MODULE_ROMFS
 	bool "ROMFS"
 	depends on FS_ROMFS && BUILD_FLAT
 	---help---
-		 Automatically generates and mounts an internal ROMFS file
-		 system
+		Automatically generates and mounts an internal ROMFS file
+		system
 
 config EXAMPLES_MODULE_CROMFS
 	bool "CROMFS"
 	depends on FS_CROMFS && BUILD_FLAT
-	 ---help---
-		 Automatically generates and mounts an internal CROMFS file
-		 system
+	---help---
+		Automatically generates and mounts an internal CROMFS file
+		system
 
 endchoice # Built-in file system type
 
@@ -119,11 +119,11 @@ config EXAMPLES_MODULE_NOSTRIP
 	default n
 	depends on DEBUG_SYMBOLS
 	---help---
-		 By default, if debug symbols are enabled (via CONFIG_DEBUG_SYMBOLS), then the
-		 ELF executables will also retain debug symbols in the resulting ELF binaries.
-		 Select this option if you do not want that behavior, this option will permit
-		 debug symbols in the base code but will strip debug symbols out of the ELF
-		 binaries for a smaller ROM file system image.
+		By default, if debug symbols are enabled (via CONFIG_DEBUG_SYMBOLS), then the
+		ELF executables will also retain debug symbols in the resulting ELF binaries.
+		Select this option if you do not want that behavior, this option will permit
+		debug symbols in the base code but will strip debug symbols out of the ELF
+		binaries for a smaller ROM file system image.
 
 config EXAMPLES_MODULE_LIBC
 	bool "Link with LIBC"
diff --git a/examples/netloop/Kconfig b/examples/netloop/Kconfig
index d310ac125..e7c94fc28 100644
--- a/examples/netloop/Kconfig
+++ b/examples/netloop/Kconfig
@@ -14,17 +14,17 @@ if EXAMPLES_NETLOOP
 if NSH_BUILTIN_APPS
 
 config EXAMPLES_NETLOOP_KEEPALIVE
-    bool "Enable TCP KeepAlive test"
-    default n
-    depends on NET_TCP_KEEPALIVE
+	bool "Enable TCP KeepAlive test"
+	default n
+	depends on NET_TCP_KEEPALIVE
 
 config EXAMPLES_NETLOOP_STACKSIZE
-    int "Loopback test stack size"
-    default 2048
+	int "Loopback test stack size"
+	default 2048
 
 config EXAMPLES_NETLOOP_PRIORITY
-    int "Loopback test task priority"
-    default 100
+	int "Loopback test task priority"
+	default 100
 
 endif # NSH_BUILTIN_APPS
 endif # EXAMPLES_NETLOOP
diff --git a/examples/powerled/Kconfig b/examples/powerled/Kconfig
index deb911da4..f3056adb0 100644
--- a/examples/powerled/Kconfig
+++ b/examples/powerled/Kconfig
@@ -12,7 +12,7 @@ config EXAMPLES_POWERLED
 if EXAMPLES_POWERLED
 
 config EXAMPLES_POWERLED_DEVPATH
-  string "Powerled device path"
+	string "Powerled device path"
 	default "dev/powerled0"
 	---help---
 		The default path to the Powerled device. Default: /dev/powerled0
diff --git a/examples/serialblaster/Kconfig b/examples/serialblaster/Kconfig
index e3c280869..a691324b1 100644
--- a/examples/serialblaster/Kconfig
+++ b/examples/serialblaster/Kconfig
@@ -4,10 +4,10 @@
 #
 
 config EXAMPLES_SERIALBLASTER
-    tristate "Serial Blaster example"
-    default n
-    ---help---
-        Enable the serial blaster example
+	tristate "Serial Blaster example"
+	default n
+	---help---
+		Enable the serial blaster example
 
 if EXAMPLES_SERIALBLASTER
 
diff --git a/examples/udgram/Kconfig b/examples/udgram/Kconfig
index ae89724bc..74c39d643 100644
--- a/examples/udgram/Kconfig
+++ b/examples/udgram/Kconfig
@@ -17,62 +17,62 @@ config EXAMPLES_UDGRAM_ADDR
 	default "/dev/fifo"
 
 config EXAMPLES_UDGRAM_SERVER_APPNAME
-    string "Server executable name"
-    default "server"
-    depends on NSH_BUILTIN_APPS
-    ---help---
-        This is the name of the built-in server application
+	string "Server executable name"
+	default "server"
+	depends on NSH_BUILTIN_APPS
+	---help---
+		This is the name of the built-in server application
 
 config EXAMPLES_UDGRAM_SERVER_STACKSIZE
-    int "Server stack size"
-    default 4096
-    depends on NSH_BUILTIN_APPS
-    ---help---
-        This is the stack size allocated when the server task runs
+	int "Server stack size"
+	default 4096
+	depends on NSH_BUILTIN_APPS
+	---help---
+		This is the stack size allocated when the server task runs
 
 config EXAMPLES_UDGRAM_SERVER_PRIORITY
-    int "Server task priority"
-    default 100
-    depends on NSH_BUILTIN_APPS
-    ---help---
-        This is the priority of the server task
+	int "Server task priority"
+	default 100
+	depends on NSH_BUILTIN_APPS
+	---help---
+		This is the priority of the server task
 
 config EXAMPLES_UDGRAM_SERVER_PROGNAME
-    string "Server program name"
-    default "server"
-    depends on BUILD_LOADABLE
-    ---help---
-        This is the name of the program that will be used when the NSH ELF
-        server program is installed.
+	string "Server program name"
+	default "server"
+	depends on BUILD_LOADABLE
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		server program is installed.
 
 config EXAMPLES_UDGRAM_CLIENT_APPNAME
-    string "Client executable name"
-    default "client"
-    depends on NSH_BUILTIN_APPS
-    ---help---
-        This is the name of the built-in client application
+	string "Client executable name"
+	default "client"
+	depends on NSH_BUILTIN_APPS
+	---help---
+		This is the name of the built-in client application
 
 config EXAMPLES_UDGRAM_CLIENT_STACKSIZE
-    int "Client stack size"
-    default 4096
-    depends on NSH_BUILTIN_APPS
-    ---help---
-        This is the stack size allocated when the client task runs
+	int "Client stack size"
+	default 4096
+	depends on NSH_BUILTIN_APPS
+	---help---
+		This is the stack size allocated when the client task runs
 
 config EXAMPLES_UDGRAM_CLIENT_PRIORITY
-    int "Client task priority"
-    default 100
-    depends on NSH_BUILTIN_APPS
-    ---help---
-        This is the priority of the client task
+	int "Client task priority"
+	default 100
+	depends on NSH_BUILTIN_APPS
+	---help---
+		This is the priority of the client task
 
 config EXAMPLES_UDGRAM_CLIENT_PROGNAME
-    string "Client program name"
-    default "client"
-    depends on BUILD_LOADABLE
-    ---help---
-        This is the name of the program that will be used when the NSH ELF
-        client program is installed.
+	string "Client program name"
+	default "client"
+	depends on BUILD_LOADABLE
+	---help---
+		This is the name of the program that will be used when the NSH ELF
+		client program is installed.
 
 
 endif # EXAMPLES_UDGRAM
diff --git a/modbus/Kconfig b/modbus/Kconfig
index 273d69257..8da277fdf 100644
--- a/modbus/Kconfig
+++ b/modbus/Kconfig
@@ -179,7 +179,7 @@ config MB_MASTER_TOTAL_SLAVE_NUM
 		NOTE: The slave ID must be continuous from 1.
 
 config MB_MASTER_DELAY_MS_CONVERT
-    int "Convert Delay value"
+	int "Convert Delay value"
 	default 200
 	---help---
 		When master sends a broadcast frame, it should allow slaves to process
@@ -187,7 +187,7 @@ config MB_MASTER_DELAY_MS_CONVERT
 		after Convert Delay time duration.
 
 config MB_MASTER_TIMEOUT_MS_RESPOND
-    int "Respond timeout value"
+	int "Respond timeout value"
 	default 1000
 	---help---
 		When master sends frame, which is not broadcast, it should wait for
diff --git a/netutils/libcurl4nx/Kconfig b/netutils/libcurl4nx/Kconfig
index bbdf99110..c1f8765d3 100644
--- a/netutils/libcurl4nx/Kconfig
+++ b/netutils/libcurl4nx/Kconfig
@@ -8,7 +8,7 @@ config NETUTILS_LIBCURL4NX
 	default n
 	depends on NET_TCP
 	select LIBC_NETDB
-        select NETUTILS_NETLIB_GENERICURLPARSER
+	select NETUTILS_NETLIB_GENERICURLPARSER
 	---help---
 		Enable the NuttX cURL like library.
 
diff --git a/netutils/ping/Kconfig b/netutils/ping/Kconfig
index 3fcd96f80..e7302ecaa 100644
--- a/netutils/ping/Kconfig
+++ b/netutils/ping/Kconfig
@@ -7,7 +7,7 @@ config NETUTILS_PING
 	bool "ICMP ping support"
 	default n
 	depends on NET_ICMP
-	help
+	---help---
 		Build in support for a IPv4 ping command.  This command ping will
 		send the ICMP ECHO_REQUEST and wait for the ICMP ECHO_RESPONSE from
 		the remote peer.
@@ -16,7 +16,7 @@ config NETUTILS_PING
 	bool "ICMPv6 ping support"
 	default n
 	depends on NET_ICMPv6
-	help
+	---help---
 		Build in support for a IPv6 ping command.  This command ping will
 		send the ICMPv6 ECHO_REQUEST and wait for the ICMPv6 ECHO_RESPONSE
 		from the remote peer.
diff --git a/system/nxrecorder/Kconfig b/system/nxrecorder/Kconfig
index abccf0020..015d8088f 100644
--- a/system/nxrecorder/Kconfig
+++ b/system/nxrecorder/Kconfig
@@ -9,7 +9,7 @@ config SYSTEM_NXRECORDER
 	depends on AUDIO
 	---help---
 		Enable support for the NxRecorder pcm raw data recorder library
-                and optional command line interface.
+		and optional command line interface.
 
 if SYSTEM_NXRECORDER
 
diff --git a/system/spi/Kconfig b/system/spi/Kconfig
index 41432cae4..2f8fb10de 100644
--- a/system/spi/Kconfig
+++ b/system/spi/Kconfig
@@ -48,25 +48,25 @@ config SPITOOL_DEFFREQ
 		Default SPI frequency (default: 4000000)
 
 config SPITOOL_DEFMODE
-        int "SPI mode"
+	int "SPI mode"
 	default 0
 	---help---
-	       Default SPI mode, where;
-                0 = CPOL=0, CHPHA=0
-                1 = CPOL=0, CHPHA=1
-                2 = CPOL=1, CHPHA=0
-                3 = CPOL=1, CHPHA=1
+		Default SPI mode, where;
+		0 = CPOL=0, CHPHA=0
+		1 = CPOL=0, CHPHA=1
+		2 = CPOL=1, CHPHA=0
+		3 = CPOL=1, CHPHA=1
 		
 config SPITOOL_DEFWIDTH
-        int "SPI Bit width"
+	int "SPI Bit width"
 	default 8
 	---help---
-	       Number of bits per SPI transfer (default 8)
+		Number of bits per SPI transfer (default 8)
 
 config SPITOOL_DEFWORDS
-        int "Number of words to transfer"
+	int "Number of words to transfer"
 	default 1
 	---help---
-	       Number of words to be transferred (default 1)
+		Number of words to be transferred (default 1)
 
 endif # SYSTEM_SPITOOL