Callisto ref removed, and Settings... files that used it dropped, replaced by SettingsFlyouts...