upstream again
xpm cleanup
moar upstream
fixed hide button position bug