cli: fix highlighting, spacing and class camelcase