Support latest theme Bono scenario