refactored color classes