some changes in highlight rules
some changes