Fix highlight. Addd kind-common.