Corrected Rain layers some more and Updated EVT layers to work similarly