More improvements on colors and lines.