Sunrise/Sunset indicator Fix

Now sunrise and sunset are calculated with a half hour grace period.