adding tons of templates and new devices