Massive update. More keywords

Many new keywords and rules of highlighting