Revert "More overt color variable naming"

This reverts commit 57535c30606c8fb335351970a23b39bb72da90e0.