Line color change on background color change and code arranging.
Merge remote-tracking branch 'origin/master'