1. Leave them where they are for now (breaks less things) and 2. pursue standardization with freedesktop.org, then 3. adopt that standard. Done in three. -- Hoyt