colorize highlited lines with nickname color if highlight is off
and a bit of tidying up