Merge "Dark theme time format"