enhance templates