Updated tag list, added templating system