Dates streamlining / themes improvements