udpate to more general themes structure