diff --git a/app/src/main/java/com/valterc/ki2/data/action/KarooAction.java b/app/src/main/java/com/valterc/ki2/data/action/KarooAction.java
index ffd183c0..6918d479 100644
--- a/app/src/main/java/com/valterc/ki2/data/action/KarooAction.java
+++ b/app/src/main/java/com/valterc/ki2/data/action/KarooAction.java
@@ -23,7 +23,8 @@ public enum KarooAction {
     VIRTUAL_ENABLE_AUDIO_ALERTS,
     VIRTUAL_SINGLE_BEEP,
     VIRTUAL_DOUBLE_BEEP,
-    VIRTUAL_BELL,
+    VIRTUAL_BELL_OLD,
+    VIRTUAL_BELL_NEW,
     VIRTUAL_LAP,
     VIRTUAL_ZOOM_OUT,
     VIRTUAL_ZOOM_IN,
diff --git a/app/src/main/java/com/valterc/ki2/data/message/AudioAlertMessage.java b/app/src/main/java/com/valterc/ki2/data/message/AudioAlertMessage.java
index 24895e48..f9086914 100644
--- a/app/src/main/java/com/valterc/ki2/data/message/AudioAlertMessage.java
+++ b/app/src/main/java/com/valterc/ki2/data/message/AudioAlertMessage.java
@@ -3,8 +3,9 @@
 import android.os.Bundle;
 
 public class AudioAlertMessage extends Message {
-    private static final String KEY_NAME = "name";
     public static final String KEY = "audio-alert";
+    private static final String KEY_NAME = "name";
+    private static final String KEY_ADJUST_INTENSITY = "adjust-intensity";
 
     public static AudioAlertMessage parse(Message message) {
         if (!message.getClassType().equals(AudioAlertMessage.class.getName())) {
@@ -15,21 +16,32 @@ public static AudioAlertMessage parse(Message message) {
     }
 
     private final String name;
+    private final boolean adjustIntensity;
 
     private AudioAlertMessage(Message message) {
         super(message);
         name = getBundle().getString(KEY_NAME);
+        adjustIntensity = getBundle().getBoolean(KEY_ADJUST_INTENSITY);
     }
 
-    public AudioAlertMessage(String name) {
+    public AudioAlertMessage(String name, boolean adjustIntensity) {
         super(KEY, new Bundle(), MessageType.AUDIO_ALERT, false);
 
         getBundle().putString(KEY_NAME, name);
+        getBundle().putBoolean(KEY_ADJUST_INTENSITY, adjustIntensity);
         this.name = name;
+        this.adjustIntensity = adjustIntensity;
+    }
+
+    public AudioAlertMessage(String name) {
+        this(name, true);
     }
 
     public String getName() {
         return name;
     }
 
+    public boolean getAdjustIntensity() {
+        return adjustIntensity;
+    }
 }
diff --git a/app/src/main/java/com/valterc/ki2/input/ActionAdapter.java b/app/src/main/java/com/valterc/ki2/input/ActionAdapter.java
index 60108941..f44d1081 100644
--- a/app/src/main/java/com/valterc/ki2/input/ActionAdapter.java
+++ b/app/src/main/java/com/valterc/ki2/input/ActionAdapter.java
@@ -47,9 +47,10 @@ public ActionAdapter(Ki2ExtensionContext context) {
         this.keyMapping.put(KarooAction.VIRTUAL_TOGGLE_AUDIO_ALERTS, karooKeyEvent -> toggleAudioAlerts(context));
         this.keyMapping.put(KarooAction.VIRTUAL_DISABLE_AUDIO_ALERTS, karooKeyEvent -> disableAudioAlerts(context));
         this.keyMapping.put(KarooAction.VIRTUAL_ENABLE_AUDIO_ALERTS, karooKeyEvent -> enableAudioAlerts(context));
-        this.keyMapping.put(KarooAction.VIRTUAL_SINGLE_BEEP, karooKeyEvent -> context.getAudioManager().playSingleBeep());
-        this.keyMapping.put(KarooAction.VIRTUAL_DOUBLE_BEEP, karooKeyEvent -> context.getAudioManager().playDoubleBeep());
-        this.keyMapping.put(KarooAction.VIRTUAL_BELL, karooKeyEvent -> context.getAudioManager().playKarooBell());
+        this.keyMapping.put(KarooAction.VIRTUAL_SINGLE_BEEP, karooKeyEvent -> context.getAudioManager().playSingleBeep(false));
+        this.keyMapping.put(KarooAction.VIRTUAL_DOUBLE_BEEP, karooKeyEvent -> context.getAudioManager().playDoubleBeep(false));
+        this.keyMapping.put(KarooAction.VIRTUAL_BELL_OLD, karooKeyEvent -> context.getAudioManager().playKarooBellOld(false));
+        this.keyMapping.put(KarooAction.VIRTUAL_BELL_NEW, karooKeyEvent -> context.getAudioManager().playKarooBellNew(false));
         this.keyMapping.put(KarooAction.VIRTUAL_LAP, karooKeyEvent -> context.getKarooSystem().dispatch(MarkLap.INSTANCE));
         this.keyMapping.put(KarooAction.VIRTUAL_ZOOM_IN, karooKeyEvent -> context.getKarooSystem().dispatch(new ZoomPage(true)));
         this.keyMapping.put(KarooAction.VIRTUAL_ZOOM_OUT, karooKeyEvent -> context.getKarooSystem().dispatch(new ZoomPage(false)));
diff --git a/app/src/main/java/com/valterc/ki2/input/InputManager.java b/app/src/main/java/com/valterc/ki2/input/InputManager.java
index e99767f3..95f7c500 100644
--- a/app/src/main/java/com/valterc/ki2/input/InputManager.java
+++ b/app/src/main/java/com/valterc/ki2/input/InputManager.java
@@ -54,7 +54,8 @@ public class InputManager {
         preferenceToSwitchKeyMap.put("press_enable_audio_alerts", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_ENABLE_AUDIO_ALERTS, switchEvent.getRepeat()));
         preferenceToSwitchKeyMap.put("press_single_beep", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_SINGLE_BEEP, switchEvent.getRepeat()));
         preferenceToSwitchKeyMap.put("press_double_beep", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_DOUBLE_BEEP, switchEvent.getRepeat()));
-        preferenceToSwitchKeyMap.put("press_bell", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_BELL, switchEvent.getRepeat()));
+        preferenceToSwitchKeyMap.put("press_bell_old", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_BELL_OLD, switchEvent.getRepeat()));
+        preferenceToSwitchKeyMap.put("press_bell_new", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_BELL_NEW, switchEvent.getRepeat()));
         preferenceToSwitchKeyMap.put("press_control_center", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_CONTROL_CENTER, switchEvent.getRepeat()));
         preferenceToSwitchKeyMap.put("press_drawer_action", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_DRAWER_ACTION, switchEvent.getRepeat()));
         preferenceToSwitchKeyMap.put("press_toggle_overlay", (switchEvent, converter) -> new KarooActionEvent(KarooAction.VIRTUAL_TOGGLE_OVERLAY, switchEvent.getRepeat()));
@@ -200,17 +201,29 @@ public class InputManager {
             }
             return new KarooActionEvent(KarooAction.VIRTUAL_SINGLE_BEEP, switchEvent.getRepeat());
         });
-        preferenceToSwitchKeyMap.put("hold_short_single_bell", (switchEvent, converter) -> {
+        preferenceToSwitchKeyMap.put("hold_short_single_bell_old", (switchEvent, converter) -> {
             if (switchEvent.getCommand() != SwitchCommand.LONG_PRESS_DOWN) {
                 return null;
             }
-            return new KarooActionEvent(KarooAction.VIRTUAL_BELL, switchEvent.getRepeat());
+            return new KarooActionEvent(KarooAction.VIRTUAL_BELL_OLD, switchEvent.getRepeat());
         });
-        preferenceToSwitchKeyMap.put("hold_continuous_bell", (switchEvent, converter) -> {
+        preferenceToSwitchKeyMap.put("hold_short_single_bell_new", (switchEvent, converter) -> {
+            if (switchEvent.getCommand() != SwitchCommand.LONG_PRESS_DOWN) {
+                return null;
+            }
+            return new KarooActionEvent(KarooAction.VIRTUAL_BELL_NEW, switchEvent.getRepeat());
+        });
+        preferenceToSwitchKeyMap.put("hold_continuous_bell_old", (switchEvent, converter) -> {
+            if (switchEvent.getCommand() == SwitchCommand.LONG_PRESS_UP) {
+                return null;
+            }
+            return new KarooActionEvent(KarooAction.VIRTUAL_BELL_OLD, switchEvent.getRepeat());
+        });
+        preferenceToSwitchKeyMap.put("hold_continuous_bell_new", (switchEvent, converter) -> {
             if (switchEvent.getCommand() == SwitchCommand.LONG_PRESS_UP) {
                 return null;
             }
-            return new KarooActionEvent(KarooAction.VIRTUAL_BELL, switchEvent.getRepeat());
+            return new KarooActionEvent(KarooAction.VIRTUAL_BELL_NEW, switchEvent.getRepeat());
         });
         preferenceToSwitchKeyMap.put("hold_short_single_toggle_overlay", (switchEvent, converter) -> {
             if (switchEvent.getCommand() != SwitchCommand.LONG_PRESS_DOWN) {
diff --git a/app/src/main/java/com/valterc/ki2/karoo/audio/AudioManager.kt b/app/src/main/java/com/valterc/ki2/karoo/audio/AudioManager.kt
index 4b8d45c0..864c59e6 100644
--- a/app/src/main/java/com/valterc/ki2/karoo/audio/AudioManager.kt
+++ b/app/src/main/java/com/valterc/ki2/karoo/audio/AudioManager.kt
@@ -21,7 +21,7 @@ class AudioManager(private val context: Ki2ExtensionContext) {
     private var intensity: AudioIntensity = AudioIntensity.Normal
 
     private val playAudioConsumer = Consumer<AudioAlertMessage> {
-        playAudio(it.name)
+        playAudio(it.name, it.adjustIntensity)
     }
 
     private val preferencesConsumer = Consumer<PreferencesView> { preferences ->
@@ -40,12 +40,13 @@ class AudioManager(private val context: Ki2ExtensionContext) {
         context.serviceClient.registerPreferencesWeakListener(preferencesConsumer)
     }
 
-    private fun playAudio(audio: String?) {
+    private fun playAudio(audio: String?, adjustIntensity: Boolean = true) {
         when (audio) {
-            "karoo_generic" -> playKarooGeneric()
-            "karoo_bell" -> playKarooBell()
-            "custom_single_beep" -> playSingleBeep()
-            "custom_double_beep" -> playDoubleBeep()
+            "karoo_generic" -> playKarooGeneric(adjustIntensity)
+            "karoo_bell_old" -> playKarooBellOld(adjustIntensity)
+            "karoo_bell_new" -> playKarooBellNew(adjustIntensity)
+            "custom_single_beep" -> playSingleBeep(adjustIntensity)
+            "custom_double_beep" -> playDoubleBeep(adjustIntensity)
             "disabled" -> return
             else -> Timber.i("Unknown audio requested '%s'", audio)
         }
@@ -63,56 +64,136 @@ class AudioManager(private val context: Ki2ExtensionContext) {
             else -> max(times(intensity.durationMultiplierK24).toInt(), 50)
         }
 
-    fun playSingleBeep() {
-        context.karooSystem.dispatch(
-            PlayBeepPattern(
-                listOf(
-                    PlayBeepPattern.Tone(5000.f, 350.d)
+    fun playSingleBeep(adjustIntensity: Boolean = true) {
+        if (adjustIntensity){
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(5000.f, 350.d)
+                    )
                 )
             )
-        )
+        } else {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(5000, 350)
+                    )
+                )
+            )
+        }
     }
 
-    fun playDoubleBeep() {
-        context.karooSystem.dispatch(
-            PlayBeepPattern(
-                listOf(
-                    PlayBeepPattern.Tone(5000.f, 350.d),
-                    PlayBeepPattern.Tone(null, 150.d),
-                    PlayBeepPattern.Tone(5000.f, 350.d)
+    fun playDoubleBeep(adjustIntensity: Boolean = true) {
+        if (adjustIntensity) {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(5000.f, 350.d),
+                        PlayBeepPattern.Tone(null, 150.d),
+                        PlayBeepPattern.Tone(5000.f, 350.d)
+                    )
                 )
             )
-        )
+        } else {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(5000, 350),
+                        PlayBeepPattern.Tone(null, 150),
+                        PlayBeepPattern.Tone(5000, 350)
+                    )
+                )
+            )
+        }
     }
 
-    private fun playKarooGeneric() {
-        context.karooSystem.dispatch(
-            PlayBeepPattern(
-                listOf(
-                    PlayBeepPattern.Tone(5000.f, 350.d),
-                    PlayBeepPattern.Tone(null, 100.d),
-                    PlayBeepPattern.Tone(4250.f, 100.d),
-                    PlayBeepPattern.Tone(null, 50.d),
-                    PlayBeepPattern.Tone(4250.f, 100.d),
-                    PlayBeepPattern.Tone(null, 50.d),
-                    PlayBeepPattern.Tone(4250.f, 100.d)
+    private fun playKarooGeneric(adjustIntensity: Boolean = true) {
+        if (adjustIntensity) {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(5000.f, 350.d),
+                        PlayBeepPattern.Tone(null, 100.d),
+                        PlayBeepPattern.Tone(4250.f, 100.d),
+                        PlayBeepPattern.Tone(null, 50.d),
+                        PlayBeepPattern.Tone(4250.f, 100.d),
+                        PlayBeepPattern.Tone(null, 50.d),
+                        PlayBeepPattern.Tone(4250.f, 100.d)
+                    )
                 )
             )
-        )
+        } else {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(5000, 350),
+                        PlayBeepPattern.Tone(null, 100),
+                        PlayBeepPattern.Tone(4250, 100),
+                        PlayBeepPattern.Tone(null, 50),
+                        PlayBeepPattern.Tone(4250, 100),
+                        PlayBeepPattern.Tone(null, 50),
+                        PlayBeepPattern.Tone(4250, 100)
+                    )
+                )
+            )
+        }
     }
 
-    fun playKarooBell() {
-        context.karooSystem.dispatch(
-            PlayBeepPattern(
-                listOf(
-                    PlayBeepPattern.Tone(3750.f, 50.d),
-                    PlayBeepPattern.Tone(5800.f, 200.d),
-                    PlayBeepPattern.Tone(null, 50.d),
-                    PlayBeepPattern.Tone(3750.f, 50.d),
-                    PlayBeepPattern.Tone(5800.f, 300.d)
+    fun playKarooBellOld(adjustIntensity: Boolean = true) {
+        if (adjustIntensity){
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(3750.f, 50.d),
+                        PlayBeepPattern.Tone(5800.f, 200.d),
+                        PlayBeepPattern.Tone(null, 50.d),
+                        PlayBeepPattern.Tone(3750.f, 50.d),
+                        PlayBeepPattern.Tone(5800.f, 300.d)
+                    )
                 )
             )
-        )
+        } else {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(3750, 50),
+                        PlayBeepPattern.Tone(5800, 200),
+                        PlayBeepPattern.Tone(null, 50),
+                        PlayBeepPattern.Tone(3750, 50),
+                        PlayBeepPattern.Tone(5800, 300)
+                    )
+                )
+            )
+        }
+    }
+
+    fun playKarooBellNew(adjustIntensity: Boolean = true) {
+        if (adjustIntensity){
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(2349.f, 31.d),
+                        PlayBeepPattern.Tone(3520.f, 125.d),
+                        PlayBeepPattern.Tone(null, 31.d),
+                        PlayBeepPattern.Tone(2349.f, 31.d),
+                        PlayBeepPattern.Tone(3520.f, 406.d)
+                    )
+                )
+            )
+        } else {
+            context.karooSystem.dispatch(
+                PlayBeepPattern(
+                    listOf(
+                        PlayBeepPattern.Tone(2349, 31),
+                        PlayBeepPattern.Tone(3520, 125),
+                        PlayBeepPattern.Tone(null, 31),
+                        PlayBeepPattern.Tone(2349, 31),
+                        PlayBeepPattern.Tone(3520, 406)
+                    )
+                )
+            )
+        }
     }
 
     fun playKarooDeviceWarning() {
diff --git a/app/src/main/java/com/valterc/ki2/update/post/PostUpdateActions.java b/app/src/main/java/com/valterc/ki2/update/post/PostUpdateActions.java
index 23a59430..0f2791c6 100644
--- a/app/src/main/java/com/valterc/ki2/update/post/PostUpdateActions.java
+++ b/app/src/main/java/com/valterc/ki2/update/post/PostUpdateActions.java
@@ -7,6 +7,7 @@
 import com.valterc.ki2.update.post.actions.IPostUpdateAction;
 import com.valterc.ki2.update.post.actions.IPreInitPostUpdateAction;
 import com.valterc.ki2.update.post.actions.KarooAudioAlertsUpdateAction;
+import com.valterc.ki2.update.post.actions.KarooBellUpdateAction;
 import com.valterc.ki2.update.post.actions.ShowOverlayUpdateAction;
 
 import java.util.HashMap;
@@ -26,6 +27,7 @@ private PostUpdateActions() {
         preInitActionMap = new HashMap<>();
         preInitActionMap.put(KarooAudioAlertsUpdateAction.class.getSimpleName(), new KarooAudioAlertsUpdateAction());
         preInitActionMap.put(ShowOverlayUpdateAction.class.getSimpleName(), new ShowOverlayUpdateAction());
+        preInitActionMap.put(KarooBellUpdateAction.class.getSimpleName(), new KarooBellUpdateAction());
         postInitActionMap = new HashMap<>();
     }
 
diff --git a/app/src/main/java/com/valterc/ki2/update/post/actions/KarooBellUpdateAction.kt b/app/src/main/java/com/valterc/ki2/update/post/actions/KarooBellUpdateAction.kt
new file mode 100644
index 00000000..7ed38770
--- /dev/null
+++ b/app/src/main/java/com/valterc/ki2/update/post/actions/KarooBellUpdateAction.kt
@@ -0,0 +1,50 @@
+package com.valterc.ki2.update.post.actions
+
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import com.valterc.ki2.R
+import com.valterc.ki2.update.post.PostUpdateContext
+
+class KarooBellUpdateAction : IPreInitPostUpdateAction {
+    override fun execute(context: PostUpdateContext) {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(context.context)
+
+        val preferencesWithPossibleBellValue = listOf(
+            context.context.getString(R.string.preference_audio_alert_lowest_gear),
+            context.context.getString(R.string.preference_audio_alert_highest_gear),
+            context.context.getString(R.string.preference_audio_alert_shifting_limit),
+            context.context.getString(R.string.preference_audio_alert_upcoming_synchro_shift),
+            context.context.getString(R.string.preference_switch_ch1_single_press),
+            context.context.getString(R.string.preference_switch_ch1_double_press),
+            context.context.getString(R.string.preference_switch_ch1_hold),
+            context.context.getString(R.string.preference_switch_ch2_single_press),
+            context.context.getString(R.string.preference_switch_ch2_double_press),
+            context.context.getString(R.string.preference_switch_ch2_hold),
+            context.context.getString(R.string.preference_switch_ch3_single_press),
+            context.context.getString(R.string.preference_switch_ch3_double_press),
+            context.context.getString(R.string.preference_switch_ch3_hold),
+            context.context.getString(R.string.preference_switch_ch4_single_press),
+            context.context.getString(R.string.preference_switch_ch4_double_press),
+            context.context.getString(R.string.preference_switch_ch4_hold),
+        )
+
+        for (preferenceKey in preferencesWithPossibleBellValue) {
+            val preferenceValue = preferences.getString(preferenceKey, null)
+
+            when (preferenceValue) {
+                "press_bell" -> preferences.edit {
+                    putString(preferenceKey, "press_bell_old")
+                }
+                "hold_short_single_bell" -> preferences.edit {
+                    putString(preferenceKey, "hold_short_single_bell_old")
+                }
+                "hold_continuous_bell" -> preferences.edit {
+                    putString(preferenceKey, "hold_continuous_bell_old")
+                }
+                "karoo_bell" -> preferences.edit {
+                    putString(preferenceKey, "karoo_bell_old")
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/valterc/ki2/views/preference/AudioAlertPreference.java b/app/src/main/java/com/valterc/ki2/views/preference/AudioAlertPreference.java
index 912148bc..725760ce 100644
--- a/app/src/main/java/com/valterc/ki2/views/preference/AudioAlertPreference.java
+++ b/app/src/main/java/com/valterc/ki2/views/preference/AudioAlertPreference.java
@@ -55,7 +55,7 @@ public void setValue(String value) {
 
         try {
             if (service != null) {
-                service.sendMessage(new AudioAlertMessage(value));
+                service.sendMessage(new AudioAlertMessage(value, true));
             }
         } catch (Exception e) {
             Timber.w(e, "Unable to send message");
diff --git a/app/src/main/java/com/valterc/ki2/views/preference/AudioPlaybackPreference.java b/app/src/main/java/com/valterc/ki2/views/preference/AudioPlaybackPreference.java
index a921aaa7..01844e72 100644
--- a/app/src/main/java/com/valterc/ki2/views/preference/AudioPlaybackPreference.java
+++ b/app/src/main/java/com/valterc/ki2/views/preference/AudioPlaybackPreference.java
@@ -55,7 +55,7 @@ public void setValue(String value) {
 
         try {
             if (service != null) {
-                service.sendMessage(new AudioAlertMessage("custom_single_beep"));
+                service.sendMessage(new AudioAlertMessage("custom_single_beep", true));
             }
         } catch (Exception e) {
             Timber.w(e, "Unable to send message");
diff --git a/app/src/main/java/com/valterc/ki2/views/preference/SwitchListPreference.java b/app/src/main/java/com/valterc/ki2/views/preference/SwitchListPreference.java
new file mode 100644
index 00000000..afd32e81
--- /dev/null
+++ b/app/src/main/java/com/valterc/ki2/views/preference/SwitchListPreference.java
@@ -0,0 +1,105 @@
+package com.valterc.ki2.views.preference;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
+
+import com.valterc.ki2.data.message.AudioAlertMessage;
+import com.valterc.ki2.services.IKi2Service;
+import com.valterc.ki2.services.Ki2Service;
+
+import timber.log.Timber;
+
+@SuppressWarnings("unused")
+public class SwitchListPreference extends ListPreference {
+
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder binder) {
+            service = IKi2Service.Stub.asInterface(binder);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            service = null;
+        }
+    };
+
+    private IKi2Service service;
+    private boolean serviceBound;
+
+    public SwitchListPreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public SwitchListPreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public SwitchListPreference(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SwitchListPreference(@NonNull Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setValue(String value) {
+        super.setValue(value);
+
+        try {
+            if (service != null) {
+                switch (value) {
+                    case "press_single_beep":
+                    case "hold_short_single_single_beep":
+                    case "hold_continuous_single_beep":
+                        service.sendMessage(new AudioAlertMessage("custom_single_beep", false));
+                        break;
+                    case "press_double_beep":
+                    case "hold_short_single_double_beep":
+                        service.sendMessage(new AudioAlertMessage("custom_double_beep", false));
+                        break;
+                    case "press_bell_old":
+                    case "hold_short_single_bell_old":
+                    case "hold_continuous_bell_old":
+                        service.sendMessage(new AudioAlertMessage("karoo_bell_old", false));
+                        break;
+                    case "press_bell_new" :
+                    case "hold_short_single_bell_new":
+                    case "hold_continuous_bell_new":
+                        service.sendMessage(new AudioAlertMessage("karoo_bell_new", false));
+                        break;
+                }
+            }
+        } catch (Exception e) {
+            Timber.w(e, "Unable to send message");
+        }
+    }
+
+    @Override
+    public void onAttached() {
+        super.onAttached();
+        serviceBound = getContext().bindService(Ki2Service.getIntent(), serviceConnection, Context.BIND_AUTO_CREATE);
+    }
+
+    @Override
+    public void onDetached() {
+        super.onDetached();
+
+        if (serviceBound) {
+            serviceBound = false;
+            try {
+                getContext().unbindService(serviceConnection);
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d4c7ea0c..75460748 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -19,7 +19,8 @@
         <item>Enable Shifting Audio Alerts</item>
         <item>Single Beep</item>
         <item>Double Beep</item>
-        <item>Bell</item>
+        <item>Bell (old)</item>
+        <item>Bell (new)</item>
         <item>Control Center</item>
         <item>Drawer</item>
     </string-array>
@@ -44,7 +45,8 @@
         <item>press_enable_audio_alerts</item>
         <item>press_single_beep</item>
         <item>press_double_beep</item>
-        <item>press_bell</item>
+        <item>press_bell_old</item>
+        <item>press_bell_new</item>
         <item>press_control_center</item>
         <item>press_drawer_action</item>
     </string-array>
@@ -70,7 +72,8 @@
         <item>Enable Shifting Audio Alerts</item>
         <item>Single Beep</item>
         <item>Double Beep</item>
-        <item>Bell</item>
+        <item>Bell (old)</item>
+        <item>Bell (new)</item>
         <item>Control Center</item>
         <item>Drawer</item>
     </string-array>
@@ -96,7 +99,8 @@
         <item>press_enable_audio_alerts</item>
         <item>press_single_beep</item>
         <item>press_double_beep</item>
-        <item>press_bell</item>
+        <item>press_bell_old</item>
+        <item>press_bell_new</item>
         <item>press_control_center</item>
         <item>press_drawer_action</item>
     </string-array>
@@ -124,11 +128,13 @@
         <item>Enable Shifting Audio Alerts</item>
         <item>Single Beep</item>
         <item>Double Beep</item>
-        <item>Bell</item>
+        <item>Bell (old)</item>
+        <item>Bell (new)</item>
         <item>Control Center</item>
         <item>Drawer</item>
         <item>Continuous Single Beep</item>
-        <item>Continuous Bell</item>
+        <item>Continuous Bell (old)</item>
+        <item>Continuous Bell (new)</item>
     </string-array>
 
     <string-array name="preference_values_switch_hold_action">
@@ -154,11 +160,13 @@
         <item>hold_short_single_enable_audio_alerts</item>
         <item>hold_short_single_single_beep</item>
         <item>hold_short_single_double_beep</item>
-        <item>hold_short_single_bell</item>
+        <item>hold_short_single_bell_old</item>
+        <item>hold_short_single_bell_new</item>
         <item>hold_short_single_control_center</item>
         <item>hold_short_single_drawer_action</item>
         <item>hold_continuous_single_beep</item>
-        <item>hold_continuous_bell</item>
+        <item>hold_continuous_bell_old</item>
+        <item>hold_continuous_bell_new</item>
     </string-array>
 
     <string-array name="preference_titles_battery_level_low">
@@ -225,18 +233,20 @@
 
     <string-array name="preference_titles_audio_alert_type">
         <item>Disabled</item>
-        <item>Karoo - Generic</item>
-        <item>Karoo - Bell</item>
         <item>Single Beep</item>
         <item>Double Beep</item>
+        <item>Karoo - Generic</item>
+        <item>Karoo - Bell (old)</item>
+        <item>Karoo - Bell (new)</item>
     </string-array>
 
     <string-array name="preference_values_audio_alert_type">
         <item>@string/value_preference_audio_alert_disabled</item>
-        <item>karoo_generic</item>
-        <item>karoo_bell</item>
         <item>custom_single_beep</item>
         <item>custom_double_beep</item>
+        <item>karoo_generic</item>
+        <item>karoo_bell_old</item>
+        <item>karoo_bell_new</item>
     </string-array>
 
     <string-array name="preference_titles_overlay_triggers">
diff --git a/app/src/main/res/xml/preferences_switches.xml b/app/src/main/res/xml/preferences_switches.xml
index 321de1fb..b3cabe81 100644
--- a/app/src/main/res/xml/preferences_switches.xml
+++ b/app/src/main/res/xml/preferences_switches.xml
@@ -5,7 +5,7 @@
 
         <PreferenceCategory app:title="@string/category_preference_switch_ch1">
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch_ch1_single_press"
                 app:entries="@array/preference_titles_switch_single_press_action"
                 app:entryValues="@array/preference_values_switch_single_press_action"
@@ -13,7 +13,7 @@
                 app:title="@string/title_preference_switch_single_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch_ch1_double_press"
                 app:entries="@array/preference_titles_switch_double_press_action"
                 app:entryValues="@array/preference_values_switch_double_press_action"
@@ -21,7 +21,7 @@
                 app:title="@string/title_preference_switch_double_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch_ch1_hold"
                 app:entries="@array/preference_titles_switch_hold_action"
                 app:entryValues="@array/preference_values_switch_hold_action"
@@ -33,7 +33,7 @@
 
         <PreferenceCategory app:title="@string/category_preference_switch_ch2">
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch_ch2_single_press"
                 app:entries="@array/preference_titles_switch_single_press_action"
                 app:entryValues="@array/preference_values_switch_single_press_action"
@@ -41,7 +41,7 @@
                 app:title="@string/title_preference_switch_single_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch_ch2_double_press"
                 app:entries="@array/preference_titles_switch_double_press_action"
                 app:entryValues="@array/preference_values_switch_double_press_action"
@@ -49,7 +49,7 @@
                 app:title="@string/title_preference_switch_double_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch_ch2_hold"
                 app:entries="@array/preference_titles_switch_hold_action"
                 app:entryValues="@array/preference_values_switch_hold_action"
@@ -61,7 +61,7 @@
 
         <PreferenceCategory app:title="@string/category_preference_switch_ch3">
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch"
                 app:entries="@array/preference_titles_switch_single_press_action"
                 app:entryValues="@array/preference_values_switch_single_press_action"
@@ -69,7 +69,7 @@
                 app:title="@string/title_preference_switch_single_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch"
                 app:entries="@array/preference_titles_switch_double_press_action"
                 app:entryValues="@array/preference_values_switch_double_press_action"
@@ -77,7 +77,7 @@
                 app:title="@string/title_preference_switch_double_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch"
                 app:entries="@array/preference_titles_switch_hold_action"
                 app:entryValues="@array/preference_values_switch_hold_action"
@@ -89,7 +89,7 @@
 
         <PreferenceCategory app:title="@string/category_preference_switch_ch4">
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch"
                 app:entries="@array/preference_titles_switch_single_press_action"
                 app:entryValues="@array/preference_values_switch_single_press_action"
@@ -97,7 +97,7 @@
                 app:title="@string/title_preference_switch_single_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch"
                 app:entries="@array/preference_titles_switch_double_press_action"
                 app:entryValues="@array/preference_values_switch_double_press_action"
@@ -105,7 +105,7 @@
                 app:title="@string/title_preference_switch_double_press"
                 app:useSimpleSummaryProvider="true" />
 
-            <ListPreference
+            <com.valterc.ki2.views.preference.SwitchListPreference
                 app:defaultValue="@string/default_preference_switch"
                 app:entries="@array/preference_titles_switch_hold_action"
                 app:entryValues="@array/preference_values_switch_hold_action"