Made other general improvements to Night Mode