Better Desktop dir detection. + Grammar !