Made all times follow 12/24hr setting