Bug code base for Yvora theme