font-lock additoins and changes