Update template to match the GUI display
Separate iOS and OSX template (again)