Adding OneDiary Support
Merging ClockModeOption changes