Add inherits keyword, tidy type highlighting
Add prime to the list of keyword characters