Icon swap, new form fields
Moving jstemplate into the flavor