Split out Color from Style.

Also refactor a small section