Progress on xdg stuff