diff --git a/keywords.txt b/keywords.txt
index ddefd30..d77a4b1 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -1,201 +1,224 @@
-#######################################
-# Syntax Coloring Map For HID
-#######################################
+# LITERAL1 specifies constants
 
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
+HIGH	LITERAL1	Constants
+LOW	LITERAL1	Constants
+INPUT	LITERAL1	Constants
+INPUT_PULLUP	LITERAL1	Constants
+OUTPUT	LITERAL1	Constants
+DEC	LITERAL1	Serial_Print
+BIN	LITERAL1	Serial_Print
+HEX	LITERAL1	Serial_Print
+OCT	LITERAL1	Serial_Print
+PI	LITERAL1
+HALF_PI	LITERAL1
+TWO_PI	LITERAL1
+LSBFIRST	LITERAL1	ShiftOut
+MSBFIRST	LITERAL1	ShiftOut
+CHANGE	LITERAL1	AttachInterrupt
+FALLING	LITERAL1	AttachInterrupt
+RISING	LITERAL1	AttachInterrupt
+DEFAULT	LITERAL1	AnalogReference
+EXTERNAL	LITERAL1	AnalogReference
+INTERNAL	LITERAL1	AnalogReference
+INTERNAL1V1	LITERAL1	AnalogReference
+INTERNAL2V56	LITERAL1	AnalogReference
 
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
+# KEYWORD1 specifies datatypes and C/C++ keywords
 
-begin	KEYWORD2
-end	KEYWORD2
+boolean	KEYWORD1	BooleanVariables
+break	KEYWORD1	Break
+byte	KEYWORD1	Byte
+case	KEYWORD1	SwitchCase
+char	KEYWORD1	Char
+class	KEYWORD1
+const	KEYWORD1	Const
+continue	KEYWORD1	Continue
+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	
+register	KEYWORD1	
+return	KEYWORD1	Return	
+short	KEYWORD1
+signed	KEYWORD1
+static	KEYWORD1	Static
+String	KEYWORD1	String	
+switch	KEYWORD1	SwitchCase
+this	KEYWORD1	
+throw	KEYWORD1	
+try	KEYWORD1	
+true	KEYWORD1	
+unsigned	KEYWORD1
+void	KEYWORD1	Void
+while	KEYWORD1	While
+word	KEYWORD1	Word
+
+# 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_
+word	KEYWORD2	word_
+
+# 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
+pow	KEYWORD2	Pow
+
+bitRead	KEYWORD2	BitRead
+bitWrite	KEYWORD2	BitWrite
+bitSet	KEYWORD2	BitSet
+bitClear	KEYWORD2	BitClear
+bit	KEYWORD2	Bit
+highByte	KEYWORD2	HighByte
+lowByte	KEYWORD2	LowByte
+
+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
+micros	KEYWORD2	Micros
+noInterrupts	KEYWORD2	NoInterrupts
+noTone	KEYWORD2	NoTone
+pinMode	KEYWORD2	PinMode
+pulseIn	KEYWORD2	PulseIn
+shiftIn	KEYWORD2	ShiftIn
+shiftOut	KEYWORD2	ShiftOut
+tone	KEYWORD2	Tone
+yield	KEYWORD2	Yield
+
+Serial	KEYWORD3	Serial
+Serial1	KEYWORD3	Serial
+Serial2	KEYWORD3	Serial
+Serial3	KEYWORD3	Serial
+SerialUSB	KEYWORD3	Serial
+begin	KEYWORD2	Serial_Begin
+end	KEYWORD2	Serial_End
+peek	KEYWORD2	Serial_Peek
+read	KEYWORD2	Serial_Read
+print	KEYWORD2	Serial_Print
+println	KEYWORD2	Serial_Println
+available	KEYWORD2	Serial_Available
+availableForWrite	KEYWORD2
+flush	KEYWORD2	Serial_Flush
+setTimeout	KEYWORD2
+find	KEYWORD2
+findUntil	KEYWORD2
+parseInt	KEYWORD2
+parseFloat	KEYWORD2
+readBytes	KEYWORD2
+readBytesUntil	KEYWORD2
+readString	KEYWORD2
+readStringUntil	KEYWORD2
+trim	KEYWORD2
+toUpperCase	KEYWORD2
+toLowerCase	KEYWORD2
+charAt	KEYWORD2
+compareTo	KEYWORD2
+concat	KEYWORD2
+endsWith	KEYWORD2
+startsWith	KEYWORD2
+equals	KEYWORD2
+equalsIgnoreCase	KEYWORD2
+getBytes	KEYWORD2
+indexOf	KEYWORD2
+lastIndexOf	KEYWORD2
+length	KEYWORD2
+replace	KEYWORD2
+setCharAt	KEYWORD2
+substring	KEYWORD2
+toCharArray	KEYWORD2
+toInt	KEYWORD2
+
+# USB-related keywords
+
+Keyboard	KEYWORD3
+Mouse	KEYWORD3
+press	KEYWORD2
+release	KEYWORD2
+releaseAll	KEYWORD2
+accept	KEYWORD2
 click	KEYWORD2
 move	KEYWORD2
-write	KEYWORD2
-press	KEYWORD2
 isPressed	KEYWORD2
-releaseAll	KEYWORD2
-buttons	KEYWORD2
-xAxis	KEYWORD2
-yAxis	KEYWORD2
-zAxis	KEYWORD2
-rxAxis	KEYWORD2
-ryAxis	KEYWORD2
-rzAxis	KEYWORD2
-dPad1	KEYWORD2
-dPad2	KEYWORD2
-HID_SendReport	KEYWORD2
 
-#######################################
-# Classes (KEYWORD3)
-#######################################
-
-Mouse	KEYWORD3
-Keyboard	KEYWORD3
-RawHID	KEYWORD3
-Media	KEYWORD3
-System	KEYWORD3
-Gamepad	KEYWORD3
-
-#######################################
-# Instances (KEYWORD2)
-#######################################
-
-#######################################
-# Constants (LITERAL1)
-#######################################
-
-#CDC
-CDC_CONTROL_LINE_OUT_DTR	LITERAL1
-CDC_CONTROL_LINE_OUT_TRS	LITERAL1
-
-#Mouse
-
-MOUSE_LEFT	LITERAL1
-MOUSE_RIGHT	LITERAL1
-MOUSE_MIDDLE	LITERAL1
-MOUSE_PREV	LITERAL1
-MOUSE_NEXT	LITERAL1
-
-#Keyboard
-
-LED_NUM_LOCK	LITERAL1
-LED_CAPS_LOCK	LITERAL1
-LED_SCROLL_LOCK	LITERAL1
-
-KEY_LEFT_CTRL	LITERAL1
-KEY_LEFT_SHIFT	LITERAL1
-KEY_LEFT_ALT	LITERAL1
-KEY_LEFT_GUI	LITERAL1
-KEY_LEFT_WINDOWS	LITERAL1
-KEY_RIGHT_CTRL	LITERAL1
-KEY_RIGHT_SHIFT	LITERAL1
-KEY_RIGHT_ALT	LITERAL1
-KEY_RIGHT_GUI	LITERAL1
-KEY_RIGHT_WINDOWS	LITERAL1
-
-KEY_UP_ARROW	LITERAL1
-KEY_DOWN_ARROW	LITERAL1
-KEY_LEFT_ARROW	LITERAL1
-KEY_RIGHT_ARROW	LITERAL1
-KEY_BACKSPACE	LITERAL1
-KEY_TAB	LITERAL1
-KEY_RETURN	LITERAL1
-KEY_ENTER	LITERAL1
-KEY_ESC	LITERAL1
-KEY_INSERT	LITERAL1
-KEY_DELETE	LITERAL1
-KEY_PAGE_UP	LITERAL1
-KEY_PAGE_DOWN	LITERAL1
-KEY_HOME	LITERAL1
-KEY_END	LITERAL1
-KEY_CAPS_LOCK	LITERAL1
-KEY_F1	LITERAL1
-KEY_F2	LITERAL1
-KEY_F3	LITERAL1
-KEY_F4	LITERAL1
-KEY_F5	LITERAL1
-KEY_F6	LITERAL1
-KEY_F7	LITERAL1
-KEY_F8	LITERAL1
-KEY_F9	LITERAL1
-KEY_F10	LITERAL1
-KEY_F11	LITERAL1
-KEY_F12	LITERAL1
-
-KEY_PRINT	LITERAL1
-KEY_NUM_LOCK	LITERAL1
-KEY_SCROLL_LOCK	LITERAL1
-KEY_PAUSE	LITERAL1
-
-#Raw Keyboard definitions
-
-RAW_KEYBOARD_LEFT_CTRL	LITERAL1
-RAW_KEYBOARD_LEFT_SHIFT	LITERAL1
-RAW_KEYBOARD_LEFT_ALT	LITERAL1
-RAW_KEYBOARD_LEFT_GUI	LITERAL1
-RAW_KEYBOARD_RIGHT_CTRL	LITERAL1
-RAW_KEYBOARD_RIGHT_SHIFT	LITERAL1
-RAW_KEYBOARD_RIGHT_ALT	LITERAL1
-RAW_KEYBOARD_RIGHT_GUI	LITERAL1
-
-RAW_KEYBOARD_KEY	LITERAL1
-
-RAW_KEYBOARD_UP_ARROW	LITERAL1
-RAW_KEYBOARD_DOWN_ARROW	LITERAL1
-RAW_KEYBOARD_LEFT_ARROW	LITERAL1
-RAW_KEYBOARD_RIGHT_ARROW	LITERAL1
-RAW_KEYBOARD_SPACEBAR	LITERAL1
-RAW_KEYBOARD_BACKSPACE	LITERAL1
-RAW_KEYBOARD_TAB	LITERAL1
-RAW_KEYBOARD_RETURN	LITERAL1
-RAW_KEYBOARD_ESC	LITERAL1
-RAW_KEYBOARD_INSERT	LITERAL1
-RAW_KEYBOARD_DELETE	LITERAL1
-RAW_KEYBOARD_PAGE_UP	LITERAL1
-RAW_KEYBOARD_PAGE_DOWN	LITERAL1
-RAW_KEYBOARD_HOME	LITERAL1
-RAW_KEYBOARD_END	LITERAL1
-RAW_KEYBOARD_CAPS_LOCK	LITERAL1
-RAW_KEYBOARD_F1	LITERAL1
-RAW_KEYBOARD_F2	LITERAL1
-RAW_KEYBOARD_F3	LITERAL1
-RAW_KEYBOARD_F4	LITERAL1
-RAW_KEYBOARD_F5	LITERAL1
-RAW_KEYBOARD_F6	LITERAL1
-RAW_KEYBOARD_F7	LITERAL1
-RAW_KEYBOARD_F8	LITERAL1
-RAW_KEYBOARD_F9	LITERAL1
-RAW_KEYBOARD_F10	LITERAL1
-RAW_KEYBOARD_F11	LITERAL1
-RAW_KEYBOARD_F12	LITERAL1
-RAW_KEYBOARD_PRINT	LITERAL1
-RAW_KEYBOARD_SCROLL_LOCK	LITERAL1
-RAW_KEYBOARD_PAUSE	LITERAL1
-
-#RawHID
-RAWHID_RX_SIZE	LITERAL1
-RAWHID_TX_SIZE	LITERAL1
-
-#Media
-
-MEDIA_FAST_FORWARD	LITERAL1
-MEDIA_REWIND	LITERAL1
-MEDIA_NEXT	LITERAL1
-MEDIA_PREVIOUS	LITERAL1
-MEDIA_STOP	LITERAL1
-MEDIA_PLAY_PAUSE	LITERAL1
-
-MEDIA_VOLUME_MUTE	LITERAL1
-MEDIA_VOLUME_UP	LITERAL1
-MEDIA_VOLUME_DOWN	LITERAL1
-
-MEDIA_EMAIL_READER	LITERAL1
-MEDIA_CALCULATOR	LITERAL1
-MEDIA_EXPLORER	LITERAL1
-
-MEDIA_BROWSER_HOME	LITERAL1
-MEDIA_BROWSER_BACK	LITERAL1
-MEDIA_BROWSER_FORWARD	LITERAL1
-MEDIA_BROWSER_REFRESH	LITERAL1
-MEDIA_BROWSER_BOOKMARKS	LITERAL1
-
-#System
-
-SYSTEM_POWER_DOWN	LITERAL1
-SYSTEM_SLEEP	LITERAL1
-SYSTEM_WAKE_UP	LITERAL1
-
-#Gamepad
-GAMEPAD_DPAD_CENTERED	LITERAL1
-GAMEPAD_DPAD_UP	LITERAL1
-GAMEPAD_DPAD_UP_RIGHT	LITERAL1
-GAMEPAD_DPAD_RIGHT	LITERAL1
-GAMEPAD_DPAD_DOWN_RIGHT	LITERAL1
-GAMEPAD_DPAD_DOWN	LITERAL1
-GAMEPAD_DPAD_DOWN_LEFT	LITERAL1
-GAMEPAD_DPAD_LEFT	LITERAL1
-GAMEPAD_DPAD_UP_LEFT	LITERAL1
+setup	KEYWORD3	Setup
+loop	KEYWORD3	Loop