Added yet another find & replace mechanism as temporary measure to get it working...
Added more generated soy templates. They probably need some manual tweaking