now adapting to vs theme