Thermal - Ported by Elbermu

Fixup