Start working on Color refactor