classic theme. headings cleanup. #3699