diff --git a/README.md b/README.md
index b38ab19..70677d3 100644
--- a/README.md
+++ b/README.md
@@ -33,5 +33,3 @@ Sounds are downloaded by [freesound.org](https://freesound.org/) with credits to
 
 - [elliottdj](https://freesound.org/people/elliottdj/sounds/685903/) published
   under [Creative Commons 0 License](https://creativecommons.org/publicdomain/zero/1.0/).
-- [tim.kahn](https://freesound.org/people/tim.kahn/sounds/95245/) published under
-  the [Attribution 4.0 License](https://creativecommons.org/licenses/by/4.0/).
\ No newline at end of file
diff --git a/app/src/main/java/com/github/arburk/vscp/app/common/PreferenceManagerWrapper.kt b/app/src/main/java/com/github/arburk/vscp/app/common/PreferenceManagerWrapper.kt
index 603a2af..92ec32e 100644
--- a/app/src/main/java/com/github/arburk/vscp/app/common/PreferenceManagerWrapper.kt
+++ b/app/src/main/java/com/github/arburk/vscp/app/common/PreferenceManagerWrapper.kt
@@ -47,7 +47,7 @@ class PreferenceManagerWrapper {
         }
       if (pref_key_sound_warning_of_next_round == key) {
         val defaultWarning =
-          Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.one_minute_left)
+          Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.one_minute_warning)
         PreferenceManager.getDefaultSharedPreferences(context).edit().putString(key, defaultWarning.toString()).apply()
         return defaultWarning
       }
diff --git a/app/src/main/java/com/github/arburk/vscp/app/service/TimerService.kt b/app/src/main/java/com/github/arburk/vscp/app/service/TimerService.kt
index 7d85330..a5bd138 100644
--- a/app/src/main/java/com/github/arburk/vscp/app/service/TimerService.kt
+++ b/app/src/main/java/com/github/arburk/vscp/app/service/TimerService.kt
@@ -62,7 +62,7 @@ class TimerService : Service(), SharedPreferences.OnSharedPreferenceChangeListen
   }
 
   override fun onCreate() {
-    // Start up the thread running the service.  Note that we create a
+    // Start up the thread running the service. Note that we create a
     // separate thread because the service normally runs in the process's
     // main thread, which we don't want to block.  We also make it
     // background priority so CPU-intensive work will not disrupt our UI.
@@ -188,7 +188,7 @@ class TimerService : Service(), SharedPreferences.OnSharedPreferenceChangeListen
       .setSound(PreferenceManagerWrapper.getChannelNotificationSound(this))
       .setDefaults(Notification.DEFAULT_VIBRATE)
       .setVibrate(LongArray(1) { 500L })
-      // TOODO: Fix issue with correct timer handling
+      // TODO: Fix issue with correct timer handling
       // .setContentIntent(pendingIntentTimer)
       .build()
 
diff --git a/app/src/main/java/com/github/arburk/vscp/app/settings/PickRingtoneContract.kt b/app/src/main/java/com/github/arburk/vscp/app/settings/PickRingtoneContract.kt
index 2e2a076..0a02d49 100644
--- a/app/src/main/java/com/github/arburk/vscp/app/settings/PickRingtoneContract.kt
+++ b/app/src/main/java/com/github/arburk/vscp/app/settings/PickRingtoneContract.kt
@@ -37,10 +37,11 @@ class PickRingtoneContract : ActivityResultContract<Int, Uri?>() {
       return null
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      return intent?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, Uri::class.java)
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      intent?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, Uri::class.java)
+    } else {
+      @Suppress("DEPRECATION") // can be removed with removal of support for Build.VERSION.SDK_INT < 33
+      intent?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
     }
-
-    return intent?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
   }
 }
\ No newline at end of file
diff --git a/app/src/main/res/raw/fight.wav b/app/src/main/res/raw/fight.wav
new file mode 100644
index 0000000..a34f735
Binary files /dev/null and b/app/src/main/res/raw/fight.wav differ
diff --git a/app/src/main/res/raw/one_minute_left.wav b/app/src/main/res/raw/one_minute_left.wav
deleted file mode 100644
index 822a8c8..0000000
Binary files a/app/src/main/res/raw/one_minute_left.wav and /dev/null differ
diff --git a/app/src/main/res/raw/one_minute_warning.wav b/app/src/main/res/raw/one_minute_warning.wav
new file mode 100644
index 0000000..91cd94c
Binary files /dev/null and b/app/src/main/res/raw/one_minute_warning.wav differ
diff --git a/gradle.properties b/gradle.properties
index a2e90d8..9eb1765 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,5 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
\ No newline at end of file
+# Enable non-final resource IDs for faster incremental compilation
+android.nonFinalResIds=true
\ No newline at end of file