Fixed issue with theme not reverting to default