Update to use xi-graphics