catalogue brand template cleanup
spell
zf1 & zf1-extrans from git