Working on OSX tempaltes
Fixed mac templates