Some changes for night mode support.