refactored color themes