Enhance theme integration.