Updated with working sunrise/sunset, default map setup