some more usage of color vars and consolidation