small UI fixes; added xml coloring support
Merge remote-tracking branch 'master/master'