Overhaul theme modification handling