last changes for v2 theme