-Better themeing sequencing.  Do not change theme while message is shown, but properly change theme after message is closed.