fixed color changes / renaming