Fix ImportError, update categories & add kinds