you’re correct, matter is made up of heat energy and chemical energy
all matter contains heat because it is the result of the movement of atoms, molecules, or ions in solids, liquids, and gases.
all matter also contains chemical energy. chemical energy is stored in the bonds of chemical compounds so atoms and molecules are held together by chemical energy
hope this helps :)