Templates updated
Management for plug-ins closes #12