change theme and add comments