diff --git a/components/mqtt/Kconfig b/components/mqtt/Kconfig
index 624b286..de79975 100644
--- a/components/mqtt/Kconfig
+++ b/components/mqtt/Kconfig
@@ -1,102 +1,103 @@
 menu "ESP-MQTT Configurations"
 
-config MQTT_PROTOCOL_311
-    bool "Enable MQTT protocol 3.1.1"
-    default y
-    help
-        If not, this library will use MQTT protocol 3.1
+    config MQTT_PROTOCOL_311
+        bool "Enable MQTT protocol 3.1.1"
+        default y
+        help
+            If not, this library will use MQTT protocol 3.1
 
-config MQTT_TRANSPORT_SSL
-    bool "Enable MQTT over SSL"
-    default y
-    help
-        Enable MQTT transport over SSL with mbedtls
+    config MQTT_TRANSPORT_SSL
+        bool "Enable MQTT over SSL"
+        default y
+        help
+            Enable MQTT transport over SSL with mbedtls
 
-config MQTT_TRANSPORT_WEBSOCKET
-    bool "Enable MQTT over Websocket"
-    default y
-    help
-        Enable MQTT transport over Websocket.
+    config MQTT_TRANSPORT_WEBSOCKET
+        bool "Enable MQTT over Websocket"
+        default y
+        help
+            Enable MQTT transport over Websocket.
 
-config MQTT_TRANSPORT_WEBSOCKET_SECURE
-    bool "Enable MQTT over Websocket Secure"
-    default y
-    depends on MQTT_TRANSPORT_WEBSOCKET
-    depends on MQTT_TRANSPORT_SSL
-    help
-        Enable MQTT transport over Websocket Secure.
+    config MQTT_TRANSPORT_WEBSOCKET_SECURE
+        bool "Enable MQTT over Websocket Secure"
+        default y
+        depends on MQTT_TRANSPORT_WEBSOCKET
+        depends on MQTT_TRANSPORT_SSL
+        help
+            Enable MQTT transport over Websocket Secure.
 
-config MQTT_USE_CUSTOM_CONFIG
-    bool "MQTT Using custom configurations"
-    default n
-    help
-        Custom MQTT configurations.
+    config MQTT_USE_CUSTOM_CONFIG
+        bool "MQTT Using custom configurations"
+        default n
+        help
+            Custom MQTT configurations.
 
-config MQTT_TCP_DEFAULT_PORT
-    int "Default MQTT over TCP port"
-    default 1883
-    depends on MQTT_USE_CUSTOM_CONFIG
-    help
-        Default MQTT over TCP port
+    config MQTT_TCP_DEFAULT_PORT
+        int "Default MQTT over TCP port"
+        default 1883
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            Default MQTT over TCP port
 
-config MQTT_SSL_DEFAULT_PORT
-    int "Default MQTT over SSL port"
-    default 8883
-    depends on MQTT_USE_CUSTOM_CONFIG
-    depends on MQTT_TRANSPORT_SSL
-    help
-        Default MQTT over SSL port
-        
-config MQTT_WS_DEFAULT_PORT
-    int "Default MQTT over Websocket port"
-    default 80
-    depends on MQTT_USE_CUSTOM_CONFIG
-    depends on MQTT_TRANSPORT_WEBSOCKET
-    help
-        Default MQTT over Websocket port
+    config MQTT_SSL_DEFAULT_PORT
+        int "Default MQTT over SSL port"
+        default 8883
+        depends on MQTT_USE_CUSTOM_CONFIG
+        depends on MQTT_TRANSPORT_SSL
+        help
+            Default MQTT over SSL port
 
-config MQTT_WSS_DEFAULT_PORT
-    int "Default MQTT over Websocket Secure port"
-    default 443
-    depends on MQTT_USE_CUSTOM_CONFIG
-    depends on MQTT_TRANSPORT_WEBSOCKET
-    depends on MQTT_TRANSPORT_WEBSOCKET_SECURE
-    help
-        Default MQTT over Websocket Secure port
+    config MQTT_WS_DEFAULT_PORT
+        int "Default MQTT over Websocket port"
+        default 80
+        depends on MQTT_USE_CUSTOM_CONFIG
+        depends on MQTT_TRANSPORT_WEBSOCKET
+        help
+            Default MQTT over Websocket port
 
-config MQTT_BUFFER_SIZE
-    int "Default MQTT Buffer Size"
-    default 1024
-    depends on MQTT_USE_CUSTOM_CONFIG
-    help
-        This buffer size using for both transmit and receive
+    config MQTT_WSS_DEFAULT_PORT
+        int "Default MQTT over Websocket Secure port"
+        default 443
+        depends on MQTT_USE_CUSTOM_CONFIG
+        depends on MQTT_TRANSPORT_WEBSOCKET
+        depends on MQTT_TRANSPORT_WEBSOCKET_SECURE
+        help
+            Default MQTT over Websocket Secure port
 
-config MQTT_TASK_STACK_SIZE
-    int "MQTT task stack size"
-    default 6144
-    depends on MQTT_USE_CUSTOM_CONFIG
-    help
-        MQTT task stack size
+    config MQTT_BUFFER_SIZE
+        int "Default MQTT Buffer Size"
+        default 1024
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            This buffer size using for both transmit and receive
 
-config MQTT_TASK_CORE_SELECTION_ENABLED
-    bool "Enable MQTT task core selection"
-    default false
-    help
-        This will enable core selection
+    config MQTT_TASK_STACK_SIZE
+        int "MQTT task stack size"
+        default 6144
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            MQTT task stack size
 
-choice MQTT_TASK_CORE_SELECTION
-    depends on MQTT_TASK_CORE_SELECTION_ENABLED
-    prompt "Core to use ?"
-    config MQTT_USE_CORE_0
-          bool "Core 0"
-    config MQTT_USE_CORE_1
-          bool "Core 1"
- endchoice
+    config MQTT_TASK_CORE_SELECTION_ENABLED
+        bool "Enable MQTT task core selection"
+        default false
+        help
+            This will enable core selection
 
-config MQTT_CUSTOM_OUTBOX
-    bool "Enable custom outbox implementation"
-    default n
-    help
-        Set to true if a specific implementation of message outbox is needed (e.g. persistant outbox in NVM or similar).
+    choice MQTT_TASK_CORE_SELECTION
+        depends on MQTT_TASK_CORE_SELECTION_ENABLED
+        prompt "Core to use ?"
+        config MQTT_USE_CORE_0
+            bool "Core 0"
+        config MQTT_USE_CORE_1
+            bool "Core 1"
+    endchoice
+
+    config MQTT_CUSTOM_OUTBOX
+        bool "Enable custom outbox implementation"
+        default n
+        help
+            Set to true if a specific implementation of message outbox is needed (e.g. persistant outbox in NVM or
+            similar).
 
 endmenu
diff --git a/examples/protocols/mqtt/ssl/main/Kconfig.projbuild b/examples/protocols/mqtt/ssl/main/Kconfig.projbuild
index 8b4eda4..7bd1fcb 100644
--- a/examples/protocols/mqtt/ssl/main/Kconfig.projbuild
+++ b/examples/protocols/mqtt/ssl/main/Kconfig.projbuild
@@ -1,31 +1,32 @@
 menu "Example Configuration"
 
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
+    config WIFI_SSID
+        string "WiFi SSID"
+        default "myssid"
+        help
+            SSID (network name) for the example to connect to.
 
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
+    config WIFI_PASSWORD
+        string "WiFi Password"
+        default "mypassword"
+        help
+            WiFi password (WPA or WPA2) for the example to use.
 
-config BROKER_URI
-    string "Broker URL"
-    default "mqtts://iot.eclipse.org:8883"
-    help
-        URL of an mqtt broker which this example connects to.
+    config BROKER_URI
+        string "Broker URL"
+        default "mqtts://iot.eclipse.org:8883"
+        help
+            URL of an mqtt broker which this example connects to.
 
-config BROKER_CERTIFICATE_OVERRIDE
-    string "Broker certificate override"
-    default ""
-    help
-        Please leave empty if broker certificate included from a textfile; otherwise fill in a base64 part of PEM format certificate
+    config BROKER_CERTIFICATE_OVERRIDE
+        string "Broker certificate override"
+        default ""
+        help
+            Please leave empty if broker certificate included from a textfile; otherwise fill in a base64 part of PEM
+            format certificate
 
-config BROKER_CERTIFICATE_OVERRIDDEN
-    bool
-    default y if BROKER_CERTIFICATE_OVERRIDE != ""
+    config BROKER_CERTIFICATE_OVERRIDDEN
+        bool
+        default y if BROKER_CERTIFICATE_OVERRIDE != ""
 
 endmenu
diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/Kconfig.projbuild b/examples/protocols/mqtt/ssl_mutual_auth/main/Kconfig.projbuild
index 176d8fb..ed4e691 100644
--- a/examples/protocols/mqtt/ssl_mutual_auth/main/Kconfig.projbuild
+++ b/examples/protocols/mqtt/ssl_mutual_auth/main/Kconfig.projbuild
@@ -1,15 +1,15 @@
 menu "Example Configuration"
 
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
+    config WIFI_SSID
+        string "WiFi SSID"
+        default "myssid"
+        help
+            SSID (network name) for the example to connect to.
 
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
+    config WIFI_PASSWORD
+        string "WiFi Password"
+        default "mypassword"
+        help
+            WiFi password (WPA or WPA2) for the example to use.
 
 endmenu
diff --git a/examples/protocols/mqtt/tcp/main/Kconfig.projbuild b/examples/protocols/mqtt/tcp/main/Kconfig.projbuild
index 71f95ea..f5c519b 100644
--- a/examples/protocols/mqtt/tcp/main/Kconfig.projbuild
+++ b/examples/protocols/mqtt/tcp/main/Kconfig.projbuild
@@ -1,25 +1,25 @@
 menu "Example Configuration"
 
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
+    config WIFI_SSID
+        string "WiFi SSID"
+        default "myssid"
+        help
+            SSID (network name) for the example to connect to.
 
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
+    config WIFI_PASSWORD
+        string "WiFi Password"
+        default "mypassword"
+        help
+            WiFi password (WPA or WPA2) for the example to use.
 
-config BROKER_URL
-    string "Broker URL"
-    default "mqtt://iot.eclipse.org"
-    help
-        URL of the broker to connect to
+    config BROKER_URL
+        string "Broker URL"
+        default "mqtt://iot.eclipse.org"
+        help
+            URL of the broker to connect to
 
-config BROKER_URL_FROM_STDIN
-    bool
-    default y if BROKER_URL = "FROM_STDIN"
+    config BROKER_URL_FROM_STDIN
+        bool
+        default y if BROKER_URL = "FROM_STDIN"
 
 endmenu
diff --git a/examples/protocols/mqtt/ws/main/Kconfig.projbuild b/examples/protocols/mqtt/ws/main/Kconfig.projbuild
index 5223e88..9e47709 100644
--- a/examples/protocols/mqtt/ws/main/Kconfig.projbuild
+++ b/examples/protocols/mqtt/ws/main/Kconfig.projbuild
@@ -1,21 +1,21 @@
 menu "Example Configuration"
 
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
+    config WIFI_SSID
+        string "WiFi SSID"
+        default "myssid"
+        help
+            SSID (network name) for the example to connect to.
 
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
+    config WIFI_PASSWORD
+        string "WiFi Password"
+        default "mypassword"
+        help
+            WiFi password (WPA or WPA2) for the example to use.
 
-config BROKER_URI
-    string "Broker URL"
-    default "ws://iot.eclipse.org:80/ws"
-    help
-        URL of an mqtt broker which this example connects to.
+    config BROKER_URI
+        string "Broker URL"
+        default "ws://iot.eclipse.org:80/ws"
+        help
+            URL of an mqtt broker which this example connects to.
 
 endmenu
diff --git a/examples/protocols/mqtt/wss/main/Kconfig.projbuild b/examples/protocols/mqtt/wss/main/Kconfig.projbuild
index 964d436..a161740 100644
--- a/examples/protocols/mqtt/wss/main/Kconfig.projbuild
+++ b/examples/protocols/mqtt/wss/main/Kconfig.projbuild
@@ -1,31 +1,32 @@
 menu "Example Configuration"
 
-config WIFI_SSID
-    string "WiFi SSID"
-    default "myssid"
-    help
-        SSID (network name) for the example to connect to.
+    config WIFI_SSID
+        string "WiFi SSID"
+        default "myssid"
+        help
+            SSID (network name) for the example to connect to.
 
-config WIFI_PASSWORD
-    string "WiFi Password"
-    default "mypassword"
-    help
-        WiFi password (WPA or WPA2) for the example to use.
+    config WIFI_PASSWORD
+        string "WiFi Password"
+        default "mypassword"
+        help
+            WiFi password (WPA or WPA2) for the example to use.
 
-config BROKER_URI
-    string "Broker URL"
-    default "wss://iot.eclipse.org:443/ws"
-    help
-        URL of an mqtt broker which this example connects to.
+    config BROKER_URI
+        string "Broker URL"
+        default "wss://iot.eclipse.org:443/ws"
+        help
+            URL of an mqtt broker which this example connects to.
 
-config BROKER_CERTIFICATE_OVERRIDE
-    string "Server certificate override"
-    default ""
-    help
-        Please leave empty if server certificate included from a textfile; otherwise fill in a base64 part of PEM format certificate
+    config BROKER_CERTIFICATE_OVERRIDE
+        string "Server certificate override"
+        default ""
+        help
+            Please leave empty if server certificate included from a textfile; otherwise fill in a base64 part of PEM
+            format certificate
 
-config BROKER_CERTIFICATE_OVERRIDDEN
-    bool
-    default y if BROKER_CERTIFICATE_OVERRIDE != ""
+    config BROKER_CERTIFICATE_OVERRIDDEN
+        bool
+        default y if BROKER_CERTIFICATE_OVERRIDE != ""
 
 endmenu