Transfer more gtk-xt code, and add some new