new fields
fix dark by switching to civil sunrise/set and adding/subtracting an hour