diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e519f16..0d0a305 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -12,15 +12,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: gradle
+      - uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
 
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..69e8615
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7742775..d29c8ab 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -10,7 +9,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 665fe06..fff2424 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Version 2.2_r1:
+- Made various under-the-hood improvements for a better overall app experience.
+
 # Version 2.1_r2:
 - Made various under-the-hood improvements for a better overall app experience.
 
@@ -6,24 +9,24 @@
 - Made various under-the-hood improvements for a better overall app experience.
 
 # Version 2.0_r1:
-- Added Store Archive compatibility;
-- Added Romanian language support;
-- Added Russian language support;
-- Added Italian language support;
-- Added Indonesian language support;
-- Added Hindi language support;
-- Added Japanese language support;
-- Added French language support;
-- Added Turkish language support;
-- Added German language support;
-- Added Spanish language support;
-- Fixed crashes;
-- Fixed app doesn't start;
-- Fixed notification not appear on (Android 13+);
+- Added Store Archive compatibility.
+- Added Romanian language support.
+- Added Russian language support.
+- Added Italian language support.
+- Added Indonesian language support.
+- Added Hindi language support.
+- Added Japanese language support.
+- Added French language support.
+- Added Turkish language support.
+- Added German language support.
+- Added Spanish language support.
+- Fixed crashes.
+- Fixed app doesn't start.
+- Fixed notification not appear on (Android 13+).
 - Under the hood improvements.
 
 # Version 1.0_r9:
-- Fixed crashes;
+- Fixed crashes.
 - Under the hood improvements.
 
 # Version 1.0_r8:
@@ -33,7 +36,7 @@
 - Under the hood improvements.
 
 # Version 1.0_r6:
-- Changes to policy;
+- Changes to policy.
 - Under the hood improvements.
 
 # Version 1.0_r5:
@@ -43,11 +46,11 @@
 - Under the hood improvements.
 
 # Version 1.0_r3:
-- Added INTERNET permission (needs for Firebase);
+- Added INTERNET permission (needs for Firebase).
 - Fixed Firebase.
 
 # Version 1.0_r2:
-- Removed useless parts of launcher icon;
+- Removed useless parts of launcher icon.
 - Fixed README and Google Play Store description.
 
 # Version 1.0_r1:
diff --git a/app/build.gradle b/app/build.gradle
index dd25145..862541a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,10 +11,10 @@ android {
         applicationId 'com.d4rk.musicsleeptimer.plus'
         minSdk 26
         targetSdk 33
-        versionCode 19
-        versionName '2.1_r2'
+        versionCode 20
+        versionName '2.2_r1'
         archivesBaseName = "com.d4rk.musicsleeptimer.plus-v${versionName}"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -33,11 +33,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
+    }
+    buildFeatures {
+        buildConfig = true
     }
     bundle {
         storeArchive {
@@ -47,7 +50,7 @@ android {
 }
 dependencies {
     implementation 'com.google.firebase:firebase-crashlytics-ktx:18.3.6'
-    implementation 'com.google.firebase:firebase-analytics-ktx:21.2.1'
+    implementation 'com.google.firebase:firebase-analytics-ktx:21.2.2'
     implementation 'com.google.firebase:firebase-perf:20.3.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.multidex:multidex:2.0.1'
diff --git a/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png b/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png
index 58e844e..2660c0d 100644
Binary files a/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png and b/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_notification.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_notification.png
index 65a9ca4..3f3b693 100644
Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_notification.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/1-screenshot_notification.png differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/2-screenshot_notification.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/2-screenshot_notification.png
index cb62565..9073de6 100644
Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/2-screenshot_notification.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/2-screenshot_notification.png differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/3-screenshot_tile_activated.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/3-screenshot_tile_activated.png
index 93a71f5..d79f870 100644
Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/3-screenshot_tile_activated.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/3-screenshot_tile_activated.png differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/4-screenshot_app_info.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/4-screenshot_app_info.png
index a387b5e..c9299e7 100644
Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/4-screenshot_app_info.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/4-screenshot_app_info.png differ
diff --git a/build.gradle b/build.gradle
index 30d8bab..12393f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
     id 'com.google.gms.google-services' version '4.3.14' apply false
     id 'com.google.firebase.crashlytics' version '2.9.2' apply false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e67736..e922e3e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 14 08:15:12 EET 2023
+#Sun Apr 16 11:54:57 EEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists