finished up on colors
merge