Copy missing templates from 2.1 branch

Not 100% tested (just datetime template).
Fix #347