Rework night mode