Generated templates are looking better