Small typographic adjustments + fix wrong highlight class name