Switch over to a refactored version of the GUI system