Add more snippets, change templates