Spaces for XML files, key tweaks, fixed window maximise