cleanup some header stuff, cm theme security