More preferences work is in this commit.