Re-work and re-enable thermal
Re-work media a bit so that it's more consistent (needs new ztream)
Small fix for CPU perc method