fixing things for merge of new theme