Completely changed highlighting. Still buggy but better