More highlighting and comment folding