Pref update

This moves some Java preferences to the Scala editor, see the commit messages for more information.