Add `xcatch', and rearrange so that the GTK-based programs are only