Adding a few more themes for evaluation