Handling 'unsetting' theme better.