re-add changes removed in merge

adds back calendar settings accidentally removed in
4669b868585dacda23d92c469a2270be24fed388