Updated how we handle colors