Added additional regular expressions for matching and highlighting