Fixing dual theme issue