diff --git a/keywords.txt b/keywords.txt
index 741b10f..5ef23e7 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -43,20 +43,20 @@ AUTO	LITERAL1
 MY_NODE_ID	LITERAL1
 MY_DEBUG_VERBOSE_TRANSPORT	LITERAL1
 MY_PARENT_NODE_ID	LITERAL1
-MY_PARENT_NODE_IS_STATIC LITERAL1
-MY_REGISTRATION_FEATURE LITERAL1
-MY_REGISTRATION_DEFAULT LITERAL1
-MY_REGISTRATION_CONTROLLER LITERAL1
-MY_CORE_COMPATIBILITY_CHECK LITERAL1
-MY_TRANSPORT_SANITY_CHECK LITERAL1
-MY_TRANSPORT_SANITY_CHECK_INTERVAL LITERAL1
+MY_PARENT_NODE_IS_STATIC	LITERAL1
+MY_REGISTRATION_FEATURE	LITERAL1
+MY_REGISTRATION_DEFAULT	LITERAL1
+MY_REGISTRATION_CONTROLLER	LITERAL1
+MY_CORE_COMPATIBILITY_CHECK	LITERAL1
+MY_TRANSPORT_SANITY_CHECK	LITERAL1
+MY_TRANSPORT_SANITY_CHECK_INTERVAL	LITERAL1
 MY_TRANSPORT_WAIT_READY_MS	LITERAL1
 MY_REPEATER_FEATURE	LITERAL1
 MY_PASSIVE_NODE	LITERAL1
 
 # debug
 MY_DEBUG	LITERAL1
-MY_SPECIAL_DEBUG LITERAL1
+MY_SPECIAL_DEBUG	LITERAL1
 
 # OTA
 MY_OTA_FIRMWARE_FEATURE	LITERAL1
@@ -104,7 +104,7 @@ MY_SOFT_SPI_MOSI_PIN	LITERAL1
 MY_RADIO_RF24	LITERAL1
 MY_DEBUG_VERBOSE_RF24	LITERAL1
 MY_RF24_ENABLE_ENCRYPTION	LITERAL1
-MY_RF24_SPI_SPEED LITERAL1
+MY_RF24_SPI_SPEED	LITERAL1
 MY_RF24_CE_PIN	LITERAL1
 MY_RF24_CS_PIN	LITERAL1
 MY_RF24_IRQ_PIN	LITERAL1
@@ -114,15 +114,15 @@ MY_RF24_DATARATE	LITERAL1
 MY_RF24_BASE_RADIO_ID	LITERAL1
 
 # NRF5
-MY_RADIO_NRF5_ESB LITERAL1
-MY_DEBUG_VERBOSE_NRF5_ESB LITERAL1
-MY_NRF5_ESB_ADDR_WIDTH LITERAL1
-MY_NRF5_ESB_BASE_RADIO_ID LITERAL1
-MY_NRF5_ESB_CHANNEL LITERAL1
-MY_NRF5_ESB_ENABLE_ENCRYPTION LITERAL1
-MY_NRF5_ESB_MODE LITERAL1
-MY_NRF5_ESB_PA_LEVEL LITERAL1
-MY_NRF5_ESB_RX_BUFFER_SIZE LITERAL1
+MY_RADIO_NRF5_ESB	LITERAL1
+MY_DEBUG_VERBOSE_NRF5_ESB	LITERAL1
+MY_NRF5_ESB_ADDR_WIDTH	LITERAL1
+MY_NRF5_ESB_BASE_RADIO_ID	LITERAL1
+MY_NRF5_ESB_CHANNEL	LITERAL1
+MY_NRF5_ESB_ENABLE_ENCRYPTION	LITERAL1
+MY_NRF5_ESB_MODE	LITERAL1
+MY_NRF5_ESB_PA_LEVEL	LITERAL1
+MY_NRF5_ESB_RX_BUFFER_SIZE	LITERAL1
 
 # RFM95
 MY_RADIO_RFM95	LITERAL1
@@ -134,8 +134,8 @@ MY_RFM95_CS_PIN	LITERAL1
 MY_RFM95_RST_PIN	LITERAL1
 MY_RFM95_SPI_SPEED	LITERAL1
 MY_RFM95_IRQ_PIN	LITERAL1
-MY_RFM95_ATC_TARGET_RSSI LITERAL1
-MY_RFM95_ATC_MODE_DISABLED LITERAL1
+MY_RFM95_ATC_TARGET_RSSI	LITERAL1
+MY_RFM95_ATC_MODE_DISABLED	LITERAL1
 MY_RFM95_ATC_TARGET_RSSI_DBM	LITERAL1
 MY_RFM95_MAX_POWER_LEVEL_DBM	LITERAL1
 
@@ -168,13 +168,13 @@ MY_RFM69_CSMA_ADD_DELAY_COUNT	LITERAL1
 MY_RS485	LITERAL1
 MY_RS485_BAUD_RATE	LITERAL1
 MY_RS485_MAX_MESSAGE_LENGTH	LITERAL1
-MY_RS485_HWSERIAL LITERAL1
+MY_RS485_HWSERIAL	LITERAL1
 MY_RS485_DE_PIN	LITERAL1
 
 # Gateway / MQTT
 MY_GATEWAY_SERIAL	LITERAL1
 MY_GATEWAY_W5100	LITERAL1
-MY_W5100_SPI_EN LITERAL1
+MY_W5100_SPI_EN	LITERAL1
 MY_GATEWAY_ENC28J60	LITERAL1
 MY_GATEWAY_ESP8266	LITERAL1
 MY_INCLUSION_BUTTON_EXTERNAL_PULLUP	LITERAL1