Increasing theme compatibility