Add Tags and change highlighting