Also color token using 'current' syntax #2907