new color for literals
Merge remote-tracking branch 'origin/master'
softer generics color