Improve highlight theme for sepia and night themes