Refactor some more
Support all colors