Bono theme refactor