Preferences added in prep for merge from lithid