Phasing out theme, fixing header underlines