reverting to old colors with some minor changes