new theme

build/shared/lib/keywords.txt

@@ -1,113 +1,60 @@
-# LITERAL1 specifies constants
+#FUNCTIONS COLOR 			#D35400 - ORANGE			KEYWORD1
+#FUNCTIONS COLOR			#D35400 - ORANGE			KEYWORD2
+#STRUCTURE COLORS 			#728E00 - GREEN			KEYWORD3
+#VARIABLES COLOR 				#00979C - BLUE				LITERAL2
 
-HIGH	LITERAL1	Constants
+# LITERAL2 specifies 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
 
-# KEYWORD1 specifies datatypes and C/C++ keywords
+HIGH	LITERAL2	Constants
+LOW	LITERAL2	Constants
+INPUT	LITERAL2	Constants
+INPUT_PULLUP	LITERAL2	Constants
+OUTPUT	LITERAL2	Constants
+DEC	LITERAL2	Serial_Print
+BIN	LITERAL2	Serial_Print
+HEX	LITERAL2	Serial_Print
+OCT	LITERAL2	Serial_Print
+PI	LITERAL2
+HALF_PI	LITERAL2
+TWO_PI	LITERAL2
+LSBFIRST	LITERAL2	ShiftOut
+MSBFIRST	LITERAL2	ShiftOut
+CHANGE	LITERAL2	AttachInterrupt
+FALLING	LITERAL2	AttachInterrupt
+RISING	LITERAL2	AttachInterrupt
+DEFAULT	LITERAL2	AnalogReference
+EXTERNAL	LITERAL2	AnalogReference
+INTERNAL	LITERAL2	AnalogReference
+INTERNAL1V1	LITERAL2	AnalogReference
+INTERNAL2V56	LITERAL2	AnalogReference
 
-boolean	KEYWORD1	BooleanVariables
+boolean	LITERAL2	BooleanVariables
-break	KEYWORD1	Break
+byte	LITERAL2	Byte
-byte	KEYWORD1	Byte
+const	LITERAL2	Const
-case	KEYWORD1	SwitchCase
+false	LITERAL2	Constants
-char	KEYWORD1	Char
+float	LITERAL2	Float
-class	KEYWORD1
+null	LITERAL2	
-const	KEYWORD1	Const
+int	LITERAL2	Int
-continue	KEYWORD1	Continue
+long	LITERAL2	Long
-default	KEYWORD1	SwitchCase	
+new	LITERAL2	
-do	KEYWORD1	DoWhile
+private	LITERAL2
-double	KEYWORD1	Double
+protected	LITERAL2	
-else	KEYWORD1	Else
+public	LITERAL2	
-false	KEYWORD1	Constants
+short	LITERAL2
-float	KEYWORD1	Float
+signed	LITERAL2
-for	KEYWORD1	For
+static	LITERAL2	Static
-if	KEYWORD1	If
+String	LITERAL2	String
-int	KEYWORD1	Int
+void	LITERAL2	Void
-long	KEYWORD1	Long
+true	LITERAL2	
-new	KEYWORD1	
+unsigned	LITERAL2
-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
+boolean	LITERAL2	boolean_
-
+byte	LITERAL2	byte_
-+=		IncrementCompound
+char	LITERAL2	char_
-+		Arithmetic
+float	LITERAL2	float_
-[]		arrayaccess
+int	LITERAL2	int_
-=		assign
+long	LITERAL2	long_
-&		BitwiseAnd
+word	LITERAL2	word_
-|		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
 
@@ -165,11 +112,11 @@ shiftOut	KEYWORD2	ShiftOut
 tone	KEYWORD2	Tone
 yield	KEYWORD2	Yield
 
-Serial	KEYWORD3	Serial
+Serial	KEYWORD1	Serial
-Serial1	KEYWORD3	Serial
+Serial1	KEYWORD1	Serial
-Serial2	KEYWORD3	Serial
+Serial2	KEYWORD1	Serial
-Serial3	KEYWORD3	Serial
+Serial3	KEYWORD1	Serial
-SerialUSB	KEYWORD3	Serial
+SerialUSB	KEYWORD1	Serial
 begin	KEYWORD2	Serial_Begin
 end	KEYWORD2	Serial_End
 peek	KEYWORD2	Serial_Peek
@@ -208,10 +155,8 @@ substring	KEYWORD2
 toCharArray	KEYWORD2
 toInt	KEYWORD2
 
-# USB-related keywords
+Keyboard	KEYWORD1
-
+Mouse	KEYWORD1
-Keyboard	KEYWORD3
-Mouse	KEYWORD3
 press	KEYWORD2
 release	KEYWORD2
 releaseAll	KEYWORD2
@@ -220,5 +165,63 @@ click	KEYWORD2
 move	KEYWORD2
 isPressed	KEYWORD2
 
+# KEYWORD3 specifies structures
+
+break	KEYWORD3	Break
+case	KEYWORD3	SwitchCase
+char	KEYWORD3	Char
+class	KEYWORD3
+continue	KEYWORD3	Continue
+default	KEYWORD3	SwitchCase	
+do	KEYWORD3	DoWhile
+double	KEYWORD3	Double
+else	KEYWORD3	Else
+for	KEYWORD3	For
+if	KEYWORD3	If
+register	KEYWORD3	
+return	KEYWORD3	Return	
+	
+switch	KEYWORD3	SwitchCase
+this	KEYWORD3	
+throw	KEYWORD3	
+try	KEYWORD3
+while	KEYWORD3	While
+word	KEYWORD3	Word
+
 setup	KEYWORD3	Setup
 loop	KEYWORD3	Loop
+
+# 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

build/shared/lib/theme/theme.txt

@@ -1,3 +1,13 @@
+#FUNCTIONS COLOR 			#D35400 - ORANGE			KEYWORD1
+#FUNCTIONS COLOR			#D35400 - ORANGE			KEYWORD2
+#STRUCTURE COLORS 			#728E00 - GREEN			KEYWORD3
+#VARIABLES COLOR 				#00979C - BLUE				LITERAL1
+
+#ERROR COLOR					#A61717 - RED
+#COMMENTS // COLOR			#95A5A6 - LIGHT GREY
+#COMMENTS /**/ COLOR		#434F54	- DARK GREY
+
+
 # GUI - STATUS
 status.notice.fgcolor = #002325
 status.notice.bgcolor = #17A1A5
@@ -20,7 +30,7 @@ console.font = Monospaced,plain,11
 console.font.macosx = Monaco,plain,10
 console.color = #000000
 console.output.color = #eeeeee
-console.error.color = #E34C00
+console.error.color = #A61717
 
 # GUI - BUTTONS
 buttons.bgcolor = #006468
@@ -65,29 +75,30 @@ editor.brackethighlight.color = #006699
 
 # TEXT - KEYWORDS
 
-# e.g abstract, final, private
+# FUNCTIONS
-editor.keyword1.style = #cc6600,plain
+editor.keyword1.style = #d35400,bold
 
-# e.g. beginShape, point, line
+# METHODS
-editor.keyword2.style = #cc6600,plain
+editor.keyword2.style = #D35400,plain
 
-# e.g. byte, char, short, color
+# STRUCTURES
-editor.keyword3.style = #cc6600,bold
+editor.keyword3.style = #728e00,plain
 
 
 # TEXT - LITERALS
 
-# constants: e.g. null, true, this, RGB, TWO_PI
+# constants & datatypes
 editor.literal1.style = #006699,plain
 
 # p5 built in variables: e.g. mouseX, width, pixels
-editor.literal2.style = #006699,plain
+editor.literal2.style = #00979C,plain
 
 # http://arduino.cc/
 editor.url.style = #0000ff,underlined
 
 # e.g. + - = /
-editor.operator.style = #000000,plain
+editor.operator.style = #434f54,plain
+
 
 # ?? maybe this is for words followed by a colon
 # like in case statements or goto
@@ -95,8 +106,8 @@ editor.label.style = #7e7e7e,bold
 
 
 # TEXT - COMMENTS
-editor.comment1.style = #7e7e7e,plain
+editor.comment1.style = #434F54,plain
-editor.comment2.style = #7e7e7e,plain
+editor.comment2.style = #95a5a6,plain
 
 
 # LINE STATUS - editor line number status bar at the bottom of the screen

libraries/Bridge/keywords.txt

@@ -3,18 +3,18 @@
 #######################################
 
 #######################################
-# Class (KEYWORD3)
+# Class (KEYWORD1)
 #######################################
 
-Bridge	KEYWORD3
+Bridge	KEYWORD1
-FileIO	KEYWORD3
+FileIO	KEYWORD4
-FileSystem	KEYWORD3
+FileSystem	KEYWORD1
-Console	KEYWORD3
+Console	KEYWORD1
-Process	KEYWORD3
+Process	KEYWORD1
-Mailbox	KEYWORD3
+Mailbox	KEYWORD1
-HttpClient	KEYWORD3
+HttpClient	KEYWORD1
-YunServer	KEYWORD3
+YunServer	KEYWORD1
-YunClient	KEYWORD3
+YunClient	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)

libraries/Esplora/keywords.txt

@@ -4,7 +4,7 @@
 # Class
 #######################################
 
-Esplora	KEYWORD3
+Esplora	KEYWORD1
 
 #######################################
 # Methods and Functions 

libraries/GSM/keywords.txt

@@ -4,16 +4,16 @@
 # Class
 #######################################
 
-GSM	KEYWORD3
+GSM	KEYWORD1
-GSMVoiceCall	KEYWORD3
+GSMVoiceCall	KEYWORD1
-GSM_SMS	KEYWORD3
+GSM_SMS	KEYWORD1
-GPRS	KEYWORD3
+GPRS	KEYWORD1
-GSMClient	KEYWORD3
+GSMClient	KEYWORD1
-GSMServer	KEYWORD3
+GSMServer	KEYWORD1
-GSMModem	KEYWORD3
+GSMModem	KEYWORD1
-GSMScanner	KEYWORD3
+GSMScanner	KEYWORD1
-GSMPIN	KEYWORD3
+GSMPIN	KEYWORD1
-GSMBand KEYWORD3
+GSMBand KEYWORD1
 
 #######################################
 # Methods and Functions 

libraries/Temboo/keywords.txt

@@ -3,10 +3,10 @@
 #######################################
 
 #######################################
-# Class (KEYWORD3)
+# Class (KEYWORD1)
 #######################################
 
-Temboo	KEYWORD3
+Temboo	KEYWORD1
 
 #######################################
 # Datatypes (KEYWORD2)

libraries/WiFi/keywords.txt

@@ -3,11 +3,11 @@
 #######################################
 
 #######################################
-# Library (KEYWORD3)
+# Library (KEYWORD1)
 #######################################
 
-WiFi	KEYWORD3
+WiFi	KEYWORD1
-WiFiUdp	KEYWORD3
+WiFiUdp	KEYWORD1
 
 #######################################
 # Datatypes (KEYWORD1)