-Adjust theme change logic since messages now block (probably still need a little work for sequencing if a message has been shown a log time)