Add after macro
Add volatile-highlights mode