PR fixes (color var changes)