Fix indentations

I propose to add the indentations to the option object and separate templates requiring by new line.