Datepicker Mac unified

Upgraded to unified api. Fixed errors