Update taghighlight & better namespace vars.