Rename colors and move to members