Fix hover and highlight coloring