Theme Sixteen; Fix a changeTheme related problem.