Added support for night mode