refactor for new bono theme