convert from jade
conver manual setup to work with new template and zap jade template