tidy up, moved macro defs to plugin, keep styles, multiple tags finder