Start working on Color refactor
Convert all uses of color to styles