Add feeds_* / remove uif / uif_plus