fixed some silly bugs in change_theme