merge with upstream, reworked weather fanart settings