Merge day/night support into master

We need confirmation that this works on an actual machine first.