diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt
index 098b79d15..04c131420 100644
--- a/build/shared/lib/keywords.txt
+++ b/build/shared/lib/keywords.txt
@@ -1,174 +1,157 @@
 # LITERAL1 specifies constants
 
-HIGH	LITERAL1
-LOW	LITERAL1
-INPUT	LITERAL1
-OUTPUT	LITERAL1
+HIGH	LITERAL1	Constants
+LOW	LITERAL1	Constants
+INPUT	LITERAL1	Constants
+OUTPUT	LITERAL1	Constants
 SERIAL	LITERAL1
 DISPLAY	LITERAL1
-DEC	LITERAL1
-BIN	LITERAL1
-HEX	LITERAL1
-OCT	LITERAL1
-BYTE	LITERAL1
+DEC	LITERAL1	Serial_Print
+BIN	LITERAL1	Serial_Print
+HEX	LITERAL1	Serial_Print
+OCT	LITERAL1	Serial_Print
+BYTE	LITERAL1	Serial_Print
 PI	LITERAL1
 HALF_PI	LITERAL1
 TWO_PI	LITERAL1
-LSBFIRST	LITERAL1
-MSBFIRST	LITERAL1
-CHANGE	LITERAL1
-FALLING	LITERAL1
-RISING	LITERAL1
-false	LITERAL1	
-true	LITERAL1	
-null	LITERAL1	
+LSBFIRST	LITERAL1	ShiftOut
+MSBFIRST	LITERAL1	ShiftOut
+CHANGE	LITERAL1	AttachInterrupt
+FALLING	LITERAL1	AttachInterrupt
+RISING	LITERAL1	AttachInterrupt
+DEFAULT	LITERAL1	AnalogReference
+EXTERNAL	LITERAL1	AnalogReference
+INTERAL	LITERAL1	AnalogReference
 
+# KEYWORD1 specifies datatypes and C/C++ keywords
 
-# KEYWORD1 specifies datatypes
-
-boolean	KEYWORD1
-byte	KEYWORD1
-char	KEYWORD1
-class	KEYWORD1	
-default	KEYWORD1	
-do	KEYWORD1	
-double	KEYWORD1	
-int	KEYWORD1
-long	KEYWORD1	
-private	KEYWORD1	
+boolean	KEYWORD1	BooleanVariables
+byte	KEYWORD1	Byte
+case	KEYWORD1	SwitchCase
+char	KEYWORD1	Char
+class	KEYWORD1
+default	KEYWORD1	SwitchCase	
+do	KEYWORD1	DoWhile
+double	KEYWORD1	Double
+else	KEYWORD1	Else
+false	KEYWORD1	Constants
+float	KEYWORD1	Float
+for	KEYWORD1	For
+if	KEYWORD1	If
+int	KEYWORD1	Int
+long	KEYWORD1	Long
+new	KEYWORD1	
+null	KEYWORD1	
+private	KEYWORD1
 protected	KEYWORD1	
 public	KEYWORD1	
-return	KEYWORD1	
-short	KEYWORD1	
+return	KEYWORD1	Return	
+short	KEYWORD1
 signed	KEYWORD1
-static	KEYWORD1	
-switch	KEYWORD1	
+static	KEYWORD1	Static	
+switch	KEYWORD1	SwitchCase
+this	KEYWORD1	
 throw	KEYWORD1	
 try	KEYWORD1	
+true	KEYWORD1	
 unsigned	KEYWORD1
-void	KEYWORD1	
+void	KEYWORD1	Void
+while	KEYWORD1	While
 
+# operators aren't highlighted, but may have documentation
+
++=		IncrementCompound
++		Arithmetic
+[]		arrayaccess
+=		assign
+&		BitwiseAnd
+|		BitwiseAnd
+,		
+//		Comments
+?:		
+{}		Braces
+--		Increment
+/		Arithmetic
+/*		Comments
+.		dot
+==		
+<		greaterthan
+<=		greaterthanorequalto
+++		Increment
+!=		inequality
+<<		Bitshift
+<		lessthan
+<=		lessthanorequalto
+&&		Boolean
+!		Boolean
+||		Boolean
+-		Arithmetic
+%		Modulo
+*		Arithmetic
+()		parentheses
+>>		Bitshift
+;		SemiColon
+-=		IncrementCompound
+
+# these are datatypes, but we've also defined functions to cast to them
+
+boolean	KEYWORD2	boolean_
+byte	KEYWORD2	byte_
+char	KEYWORD2	char_
+float	KEYWORD2	float_
+int	KEYWORD2	int_
+long	KEYWORD2	long_
 
 # KEYWORD2 specifies methods and functions
 
+abs	KEYWORD2	Abs
+acos	KEYWORD2	ACos
+asin	KEYWORD2	ASin
+atan	KEYWORD2	ATan
+atan2	KEYWORD2	ATan2
+ceil	KEYWORD2	Ceil
+constrain	KEYWORD2	Constrain
+cos	KEYWORD2	Cos
+degrees	KEYWORD2
+exp	KEYWORD2	Exp
+floor	KEYWORD2	Floor
+log	KEYWORD2	Log
+map	KEYWORD2	Map
+max	KEYWORD2	Max
+min	KEYWORD2	Min
+radians	KEYWORD2
+random	KEYWORD2	Random
+randomSeed	KEYWORD2	RandomSeed
+round	KEYWORD2
+sin	KEYWORD2	Sin
+sq	KEYWORD2	Sq
+sqrt	KEYWORD2	Sqrt
+tan	KEYWORD2	Tan
 
-abs	KEYWORD2	abs_
-acos	KEYWORD2	acos_
-+=		addassign
-+		addition
-[]		arrayaccess
-asin	KEYWORD2	asin_
-=		assign
-atan	KEYWORD2	atan_
-atan2	KEYWORD2	atan2_
-&		bitwiseAND
-|		bitwiseOR
-boolean	KEYWORD1	boolean
-boolean	KEYWORD2	boolean_
-byte	KEYWORD1	byte
-byte	KEYWORD2	byte_
-case	KEYWORD1	case
-ceil	KEYWORD2	ceil_
-char	KEYWORD1	char
-char	KEYWORD2	char_
-class	KEYWORD1	class
-,		comma
-//		comment
-?:	KEYWORD1	conditional_
-constrain	KEYWORD2	constrain_
-cos	KEYWORD2	cos_
-{}		curlybraces
---		decrement
-DEFAULT	KEYWORD1	DEFAULT
-default	KEYWORD1	default
-delay	KEYWORD2	delay_
-delayMicroseconds	KEYWORD2
-/		divide
-/**		doccomment
-.		dot
-else	KEYWORD1	else
-==		equality
-exp	KEYWORD2	exp_
-EXTERNAL	KEYWORD1	EXTERNAL
-false	KEYWORD1	false
-float	KEYWORD1	float
-float	KEYWORD2	float_
-floor	KEYWORD2	floor_
-for	KEYWORD1	for_
-<		greaterthan
-<=		greaterthanorequalto
-HALF_PI	LITERAL1	HALF_PI
-if	KEYWORD1	if_
-++		increment
-!=		inequality
-int	KEYWORD1	int
-int	KEYWORD2	int_
-INTERNAL	KEYWORD1	INTERNAL
-<<		leftshift
-<		lessthan
-<=		lessthanorequalto
-log	KEYWORD2	log_
-&&		logicalAND
-!		logicalNOT
-||		logicalOR
-loop	KEYWORD3	loop_
-max	KEYWORD2	max_
-millis	KEYWORD2	millis_
-min	KEYWORD2	min_
--		minus
-%		modulo
-/*		multilinecomment
-*		multiply
-new	KEYWORD1	new
-null	KEYWORD1	null
-()		parentheses
-PI	LITERAL1	PI
-return	KEYWORD1	return
->>		rightshift
-;		semicolon
-Serial  KEYWORD3  Serial
-setup	KEYWORD3	setup_
-sin	KEYWORD2	sin_
-sq	KEYWORD2	sq_
-sqrt	KEYWORD2	sqrt_
--=		subtractassign
-switch	KEYWORD2	switch_
-tan	KEYWORD2	tan_
-this	KEYWORD1	this
-true	KEYWORD1	true
-TWO_PI	LITERAL1	TWO_PI
-void	KEYWORD1	void
-while	KEYWORD1	while_
+analogReference	KEYWORD2	AnalogReference
+analogRead	KEYWORD2	AnalogRead
+analogWrite	KEYWORD2	AnalogWrite
+attachInterrupt	KEYWORD2	AttachInterrupt
+detachInterrupt	KEYWORD2	DetachInterrupt
+delay	KEYWORD2	Delay
+delayMicroseconds	KEYWORD2	DelayMicroseconds
+digitalWrite	KEYWORD2	DigitalWrite
+digitalRead	KEYWORD2	DigitalRead
+interrupts	KEYWORD2
+millis	KEYWORD2	Millis
+noInterrupts	KEYWORD2
+pinMode	KEYWORD2	PinMode
+pulseIn	KEYWORD2	PulseIn
+shiftOut	KEYWORD2	ShiftOut
 
+Serial  KEYWORD3
 Serial	KEYWORD2
-begin	KEYWORD2
-read	KEYWORD2
-print	KEYWORD2
-write	KEYWORD2
-println	KEYWORD2
-available	KEYWORD2
-flush	KEYWORD2
-digitalWrite	KEYWORD2
-digitalRead	KEYWORD2
-pinMode	KEYWORD2
-analogReference	KEYWORD2
-analogRead	KEYWORD2
-analogWrite	KEYWORD2
-attachInterrupt	KEYWORD2
-detachInterrupt	KEYWORD2
-beginSerial	KEYWORD2
-serialWrite	KEYWORD2
-serialRead	KEYWORD2
-serialAvailable	KEYWORD2
-printString	KEYWORD2
-printInteger	KEYWORD2
-printByte	KEYWORD2
-printHex	KEYWORD2
-printOctal	KEYWORD2
-printBinary	KEYWORD2
-printNewline	KEYWORD2
-pulseIn	KEYWORD2
-shiftOut	KEYWORD2
-map	KEYWORD2
-random	KEYWORD2
-randomSeed	KEYWORD2
\ No newline at end of file
+begin	KEYWORD2	Serial_Begin
+read	KEYWORD2	Serial_Read
+print	KEYWORD2	Serial_Print
+println	KEYWORD2	Serial_Println
+available	KEYWORD2	Serial_Available
+flush	KEYWORD2	Serial_Flush
+
+setup	KEYWORD3	Setup
+loop	KEYWORD3	Loop
\ No newline at end of file