highlight color preserved
highlight fixes