Change main templates to ODI style