Fixed Oswin's colors
Merge remote-tracking branch 'origin/palette' into palette