Added highlighting of defined words