Dietary icons added, colour swatches added and template completed