Switch to new battery implementation (ListPreference) Thanks CM