Potentially fixed bug with theme change.