changed names and references of colors