Took out warnings about folding (it does work).
Better coloring for different highlight settings.