fixing cms plugin with templates and more