Update colors
Merge