updated colors, added line numbers