diff --git a/keywords.txt b/keywords.txt
index f384be18..b0851f4e 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -6,66 +6,77 @@
 # Datatypes (KEYWORD1)
 #######################################
 
-Firmata                     KEYWORD1
-callbackFunction            KEYWORD1
-systemResetCallbackFunction KEYWORD1
-stringCallbackFunction      KEYWORD1
-sysexCallbackFunction       KEYWORD1
+Firmata											KEYWORD1	Firmata
+callbackFunction						KEYWORD1	callbackFunction
+systemResetCallbackFunction	KEYWORD1	systemResetCallbackFunction
+stringCallbackFunction			KEYWORD1	stringCallbackFunction
+sysexCallbackFunction				KEYWORD1	sysexCallbackFunction
 
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
 
-begin                       KEYWORD2
-printVersion                KEYWORD2
-blinkVersion                KEYWORD2
-printFirmwareVersion        KEYWORD2
-setFirmwareVersion          KEYWORD2
-setFirmwareNameAndVersion   KEYWORD2
-available                   KEYWORD2
-processInput                KEYWORD2
-sendAnalog                  KEYWORD2
-sendDigital                 KEYWORD2
-sendDigitalPort             KEYWORD2
-sendString                  KEYWORD2
-sendSysex                   KEYWORD2
-attach                      KEYWORD2
-detach                      KEYWORD2
-write                       KEYWORD2
-sendValueAsTwo7bitBytes     KEYWORD2
-startSysex                  KEYWORD2
-endSysex                    KEYWORD2
+begin												KEYWORD2
+printVersion								KEYWORD2
+blinkVersion								KEYWORD2
+printFirmwareVersion				KEYWORD2
+setFirmwareVersion					KEYWORD2
+setFirmwareNameAndVersion		KEYWORD2
+available										KEYWORD2
+processInput								KEYWORD2
+sendAnalog									KEYWORD2
+sendDigital									KEYWORD2
+sendDigitalPort							KEYWORD2
+sendString									KEYWORD2
+sendSysex										KEYWORD2
+attach											KEYWORD2
+detach											KEYWORD2
+write												KEYWORD2
+sendValueAsTwo7bitBytes			KEYWORD2
+startSysex									KEYWORD2
+endSysex										KEYWORD2
+
+writePort										KEYWORD2
+readPort										KEYWORD2
 
 
 #######################################
 # Constants (LITERAL1)
 #######################################
 
-MAX_DATA_BYTES      LITERAL1
+FIRMATA_MAJOR_VERSION		LITERAL1
+FIRMATA_MINOR_VERSION 	LITERAL1
+FIRMATA_BUGFIX_VERSION 	LITERAL1
 
-DIGITAL_MESSAGE     LITERAL1
-ANALOG_MESSAGE      LITERAL1
-REPORT_ANALOG       LITERAL1
-REPORT_DIGITAL      LITERAL1
-REPORT_VERSION      LITERAL1
-SET_PIN_MODE        LITERAL1
-SYSTEM_RESET        LITERAL1
-START_SYSEX         LITERAL1
-END_SYSEX           LITERAL1
+MAX_DATA_BYTES					LITERAL1
 
-ANALOG              LITERAL1
-PWM                 LITERAL1
-SERVO               LITERAL1
-SHIFT               LITERAL1
-I2C                 LITERAL1
-ONEWIRE             LITERAL1
-STEPPER             LITERAL1
-ENCODER             LITERAL1
-IGNORE              LITERAL1
+DIGITAL_MESSAGE					LITERAL1
+ANALOG_MESSAGE					LITERAL1
+REPORT_ANALOG						LITERAL1
+REPORT_DIGITAL					LITERAL1
+REPORT_VERSION					LITERAL1
+SET_PIN_MODE						LITERAL1
+SYSTEM_RESET						LITERAL1
+START_SYSEX							LITERAL1
+END_SYSEX								LITERAL1
+REPORT_FIRMWARE					LITERAL1
+STRING_DATA							LITERAL1
 
+ANALOG									LITERAL1
+PWM											LITERAL1
+SERVO										LITERAL1
+SHIFT										LITERAL1
+I2C											LITERAL1
+ONEWIRE									LITERAL1
+STEPPER									LITERAL1
+ENCODER									LITERAL1
+MODE_SERIAL							LITERAL1
+IGNORE									LITERAL1
 
-TOTAL_ANALOG_PINS   LITERAL1
-TOTAL_DIGITAL_PINS  LITERAL1
-TOTAL_PIN_MODES     LITERAL1
-TOTAL_PORTS         LITERAL1
-ANALOG_PORT         LITERAL1
+TOTAL_PINS							LITERAL1
+TOTAL_ANALOG_PINS				LITERAL1
+TOTAL_DIGITAL_PINS			LITERAL1
+TOTAL_PIN_MODES					LITERAL1
+TOTAL_PORTS							LITERAL1
+ANALOG_PORT							LITERAL1
+MAX_SERVOS							LITERAL1