added fixed to templates and config