Heavy rain returns Sunday; expect thunderstorms