Massively improved templates quality