Updated to match 10.8 preferences