Bug code base for Viverra theme