remove ifsetting template tag
adapt templates to new style