Merged prefsadvanced.* with dialogs.*