Merged Themal into Element enum

Did say i was going to do it. As i started to work down the list i
realized even though its hard to read its better this way. Still need to
test how much this impacts the system and if i should turn it into a
data base instead.