Changed separator color.
Fixed Merge conflict