updated templates and packages