Refactored colors

Refactoring colors in preparation for migration to changeable colors