CS
#30 Set colors more consistent