Simplify color handling