more highlight improvements for terminal