diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 217e5c5..9a55c2d 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
+    <option name="version" value="1.8.22" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 607b365..7931db7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Version 2.4_r1:
+- Made various under-the-hood improvements for a better overall app experience.
+
 # Version 2.3_r2:
 - Made minor under-the-hood improvements for a better overall app experience.
 
diff --git a/app/build.gradle b/app/build.gradle
index 9604598..0088657 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,9 +11,9 @@ android {
         applicationId 'com.d4rk.musicsleeptimer.plus'
         minSdk 26
         targetSdk 33
-        versionCode 22
-        versionName '2.3_r2'
-        archivesBaseName = "com.d4rk.musicsleeptimer.plus-v${versionName}"
+        versionCode 23
+        versionName '2.4_r1'
+        archivesBaseName = "${applicationId}-v${versionName}"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         resourceConfigurations += ['bg', 'de', 'en', 'es', 'fr', 'hi', 'hu', 'in', 'it', 'ja', 'pl', 'ro', 'ru', 'sv', 'tr', 'uk']
     }
@@ -40,9 +40,6 @@ android {
     kotlinOptions {
         jvmTarget = '17'
     }
-    buildFeatures {
-        buildConfig = true
-    }
     bundle {
         storeArchive {
             enable = true
@@ -51,8 +48,8 @@ android {
 }
 dependencies {
     implementation 'com.google.firebase:firebase-crashlytics-ktx:18.3.7'
-    implementation 'com.google.firebase:firebase-analytics-ktx:21.2.2'
-    implementation 'com.google.firebase:firebase-perf:20.3.2'
+    implementation 'com.google.firebase:firebase-analytics-ktx:21.3.0'
+    implementation 'com.google.firebase:firebase-perf:20.3.3'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     testImplementation 'junit:junit:4.13.2'
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc4c6cd..d2046de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,4 @@
 <resources>
-    <string name="app_name" translatable="false">Music Sleep Timer</string>
     <string name="app_description">Set your music to stop after you fall asleep.</string>
     <string name="tile_subtitle">Tap to start</string>
-    <string name="notification_action_increment" translatable="false">+%d</string>
-    <string name="notification_action_decrement" translatable="false">-%d</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml
new file mode 100644
index 0000000..401fb65
--- /dev/null
+++ b/app/src/main/res/values/untranslatable_strings.xml
@@ -0,0 +1,5 @@
+<resources>
+    <string name="app_name" translatable="false">Music Sleep Timer</string>
+    <string name="notification_action_increment" translatable="false">+%d</string>
+    <string name="notification_action_decrement" translatable="false">-%d</string>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a175075..dd026e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'com.android.application' version '8.0.1' apply false
-    id 'com.android.library' version '8.0.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
-    id 'com.google.gms.google-services' version '4.3.14' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
+    id 'com.google.gms.google-services' version '4.3.15' apply false
     id 'com.google.firebase.crashlytics' version '2.9.2' apply false
 }
 task clean(type: Delete) {