last changes for new v2 theme