More highlight tweaking for search, makes it much easier to theme