new colors
Merge branch 'addedSomeColors'