thunderstorm: a storm resulting from strong rising air currents; heavy rain or hail along with thunder and lightning
storm: a violent weather condition with winds 64-72 knots (11 on the Beaufort scale) and precipitation and thunder and lightning