Moving accessibility stuff into plugin