diff --git a/keywords.txt b/keywords.txt
index a7fdf1a..473c5da 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -37,6 +37,10 @@ MY_BAUD_RATE	LITERAL1
 MY_CRITICAL_SECTION	LITERAL1
 MY_RX_MESSAGE_BUFFER_SIZE	LITERAL1
 MY_RX_MESSAGE_BUFFER_FEATURE	LITERAL1
+MY_DISABLED_SERIAL	LITERAL1
+MY_SPLASH_SCREEN_DISABLED	LITERAL1
+MY_INDICATION_HANDLER	LITERAL1
+MY_DISABLE_RAM_ROUTING_TABLE_FEATURE	LITERAL1
 
 # transport
 AUTO	LITERAL1
@@ -51,8 +55,10 @@ MY_CORE_COMPATIBILITY_CHECK	LITERAL1
 MY_TRANSPORT_SANITY_CHECK	LITERAL1
 MY_TRANSPORT_SANITY_CHECK_INTERVAL	LITERAL1
 MY_TRANSPORT_WAIT_READY_MS	LITERAL1
+MY_TRANSPORT_UPLINK_CHECK_DISABLED	LITERAL1
 MY_REPEATER_FEATURE	LITERAL1
 MY_PASSIVE_NODE	LITERAL1
+MY_SIGNAL_REPORT_ENABLED	LITERAL1
 
 # debug
 MY_DEBUG	LITERAL1
@@ -60,6 +66,7 @@ MY_DEBUGDEVICE	LITERAL1
 MY_DEBUG_OTA	LITERAL1
 MY_DEBUG_OTA_DISABLE_ACK 	LITERAL1
 MY_SPECIAL_DEBUG	LITERAL1
+MY_DEBUG_VERBOSE_GATEWAY	LITERAL1
 
 # OTA
 MY_OTA_FIRMWARE_FEATURE	LITERAL1
@@ -77,10 +84,12 @@ MY_INCLUSION_MODE_FEATURE	LITERAL1
 MY_INCLUSION_BUTTON_FEATURE	LITERAL1
 MY_INCLUSION_MODE_BUTTON_PIN	LITERAL1
 MY_INCLUSION_MODE_DURATION	LITERAL1
+MY_INCLUSION_LED_PIN	LITERAL1
 MY_OTA_LOG_RECEIVER_FEATURE	LITERAL1
 MY_OTA_LOG_SENDER_FEATURE	LITERAL1
 MY_DEBUG_OTA 	LITERAL1
 MY_DEBUG_OTA_DISABLE_ACK 	LITERAL1
+MY_OTA_USE_I2C_EEPROM	LITERAL1
 
 # Signing
 MY_DEBUG_VERBOSE_SIGNING	LITERAL1
@@ -121,6 +130,7 @@ MY_RF24_PA_LEVEL	LITERAL1
 MY_RF24_CHANNEL	LITERAL1
 MY_RF24_DATARATE	LITERAL1
 MY_RF24_BASE_RADIO_ID	LITERAL1
+MY_RF24_POWER_PIN	LITERAL1
 
 # NRF5
 MY_RADIO_NRF5_ESB	LITERAL1
@@ -132,6 +142,8 @@ 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_NRF5_ESB_REVERSE_ACK_RX	LITERAL1
+MY_NRF5_ESB_REVERSE_ACK_TX	LITERAL1
 
 # RFM95
 MY_RADIO_RFM95	LITERAL1
@@ -148,6 +160,8 @@ 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
+MY_RFM95_POWER_PIN	LITERAL1
+MY_RFM95_TCXO	LITERAL1
 
 # RFM69
 MY_RADIO_RFM69	LITERAL1
@@ -174,6 +188,8 @@ MY_RFM69_BITRATE_MSB	LITERAL1
 MY_RFM69_BITRATE_LSB	LITERAL1
 MY_RFM69_CSMA_ADD_DELAY_BASE	LITERAL1
 MY_RFM69_CSMA_ADD_DELAY_COUNT	LITERAL1
+MY_RFM69_POWER_PIN	LITERAL1
+MY_RFM69_MODEM_CONFIGURATION	LITERAL1
 
 # RS485
 MY_RS485	LITERAL1
@@ -194,6 +210,7 @@ MY_MQTT_SUBSCRIBE_TOPIC_PREFIX	LITERAL1
 MY_MQTT_PUBLISH_TOPIC_PREFIX	LITERAL1
 MY_MQTT_CLIENT_ID	LITERAL1
 MY_GATEWAY_MQTT_CLIENT	LITERAL1
+MY_MQTT_CLIENT_PUBLISH_RETAIN	LITERAL1
 
 # Ethernet
 MY_PORT	LITERAL1
@@ -215,3 +232,15 @@ MY_ESP8266_PASSWORD	LITERAL1
 MY_ESP8266_BSSID	LITERAL1
 MY_ESP8266_HOSTNAME	LITERAL1
 MY_ESP8266_SERIAL_MODE	LITERAL1
+
+# Blacklist - autodefines that are used internally and should not be highlighted, hence commented.
+# MY_SIGNING_FEATURE
+# MY_ENCRYPTION_FEATURE
+# MY_LOCK_DEVICE
+# MY_LINUX_SERIAL_PORT
+# MY_LINUX_SERIAL_IS_PTY
+# MY_LINUX_SERIAL_GROUPNAME
+# MY_LINUX_SERIAL_PTY
+# MY_LINUX_IS_SERIAL_PTY
+# MY_GATEWAY_LINUX
+