new colors
Merge branch 'new_colors'