Fix night mode
Merge branch 'mbehrooz_calendar' into interruptions