change theme, bug fix