improvement in classic theme