Highlight notifications

Here is the correct pull request.
Sorry for the typo in the last one.

I also fixes the order of the HLs in the notification