more fixes vpc theme