Changes in templates (TODO: missing some templates, still working this weekend)