Fix initial color
Merge branch 'change-color'