Added "tomorrow" and (optional) date to separators