Change options json structure, tweak templates.