diff --git a/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt b/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt
index ece8e81..c471da5 100644
--- a/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt
+++ b/app/src/main/kotlin/de/timklge/karooreminder/KarooReminderExtension.kt
@@ -75,7 +75,7 @@ class KarooReminderExtension : KarooExtension("karoo-reminder", "1.1.1") {
 
     private var jobs: MutableSet<Job> = mutableSetOf()
 
-    data class DisplayedReminder(val tones: ReminderBeepPattern, val trigger: ReminderTrigger, val alert: InRideAlert)
+    data class DisplayedReminder(val beepPattern: ReminderBeepPattern, val trigger: ReminderTrigger, val alert: InRideAlert)
 
     private var reminderChannel = Channel<DisplayedReminder>(2, BufferOverflow.DROP_OLDEST)
 
@@ -99,8 +99,8 @@ class KarooReminderExtension : KarooExtension("karoo-reminder", "1.1.1") {
                 delay(1_000)
                 applicationContext.sendBroadcast(intent)
 
-                if (displayedReminder.tones != ReminderBeepPattern.NO_TONES) {
-                    karooSystem.dispatch(PlayBeepPattern(displayedReminder.tones.tones))
+                if (displayedReminder.beepPattern != ReminderBeepPattern.NO_TONES) {
+                    karooSystem.dispatch(PlayBeepPattern(displayedReminder.beepPattern.tones))
                     mediaPlayer?.start()
                 }
                 karooSystem.dispatch(displayedReminder.alert)
diff --git a/app/src/main/kotlin/de/timklge/karooreminder/screens/DetailScreen.kt b/app/src/main/kotlin/de/timklge/karooreminder/screens/DetailScreen.kt
index 700a410..01a7014 100644
--- a/app/src/main/kotlin/de/timklge/karooreminder/screens/DetailScreen.kt
+++ b/app/src/main/kotlin/de/timklge/karooreminder/screens/DetailScreen.kt
@@ -295,15 +295,17 @@ fun DetailScreen(isCreating: Boolean, reminder: Reminder, onSubmit: (updatedRemi
                             .fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) {
 
                             ReminderBeepPattern.entries.forEach { pattern ->
+                                val tones = pattern.tones
+
                                 Row(modifier = Modifier
                                     .fillMaxWidth()
                                     .clickable {
                                         dialogSelectedTone = pattern
-                                        karooSystem.dispatch(PlayBeepPattern(pattern.tones))
+                                        karooSystem.dispatch(PlayBeepPattern(tones))
                                     }, verticalAlignment = Alignment.CenterVertically) {
                                     RadioButton(selected = dialogSelectedTone == pattern, onClick = {
                                         dialogSelectedTone = pattern
-                                        karooSystem.dispatch(PlayBeepPattern(pattern.tones))
+                                        karooSystem.dispatch(PlayBeepPattern(tones))
                                     })
                                     Text(
                                         text = pattern.displayName,
diff --git a/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt b/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt
index e83e25b..2975285 100644
--- a/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt
+++ b/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt
@@ -12,16 +12,16 @@ import kotlinx.serialization.json.Json
 @Serializable
 enum class ReminderBeepPattern(val displayName: String, val tones: List<PlayBeepPattern.Tone>) {
     NO_TONES("No tones", emptyList()),
-    THREE_TONES_UP("Three tones up", listOf(PlayBeepPattern.Tone(500, 200), PlayBeepPattern.Tone(700, 200), PlayBeepPattern.Tone(900, 200))),
-    THREE_TONES_DOWN("Three tones down", listOf(PlayBeepPattern.Tone(900, 200), PlayBeepPattern.Tone(700, 200), PlayBeepPattern.Tone(400, 200))),
+    THREE_TONES_UP("Three tones up", listOf(PlayBeepPattern.Tone(2_000, 200), PlayBeepPattern.Tone(2_500, 200), PlayBeepPattern.Tone(3_000, 200))),
+    THREE_TONES_DOWN("Three tones down", listOf(PlayBeepPattern.Tone(3_000, 200), PlayBeepPattern.Tone(2_500, 200), PlayBeepPattern.Tone(2_000, 200))),
     DOUBLE_HIGH("Double high", listOf(
-        PlayBeepPattern.Tone(400, 400),
+        PlayBeepPattern.Tone(2_200, 400),
         PlayBeepPattern.Tone(0, 200),
-        PlayBeepPattern.Tone(600, 200),
+        PlayBeepPattern.Tone(2_800, 200),
         PlayBeepPattern.Tone(0, 200),
-        PlayBeepPattern.Tone(600, 200),
+        PlayBeepPattern.Tone(2_800, 200),
         PlayBeepPattern.Tone(0, 200),
-        PlayBeepPattern.Tone(400, 400))
+        PlayBeepPattern.Tone(2_200, 400))
     )
 }