This adds the "-face" suffix to the `:inherit` definitions of the new
kind-based faces