Update keyword list and snippets

See commits for details.