Clean theme compatibility improvements