Changes to support Textual 5.0