Continued working on themes functionality