added themes and updated view