added more highlight rules