Changed current line highlighter to based on the background color.
Merged files.