[UPDATE] Comply to bono-theme