Changed regular expressions for 'date' and 'time' templates