cloneable decorator + changed template names in other decorators