464 refactor color variables take two