Added themes to data search #20