diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 2cb5be48a..eaf2b81b4 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -42,13 +42,13 @@ kotlin {
 
 android {
 
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 32
+        targetSdk = 33
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt
index 0c4225f99..390644283 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt
@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -52,7 +53,12 @@ class FrequencyChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        view.onScroll(
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            -dpToPixels(150),
+            0f
+        )
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
index 4f504d8be..e82693461 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -63,7 +64,12 @@ class ScoreChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        view.onScroll(
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            -dpToPixels(150),
+            0f
+        )
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }
diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml
index 9377e42c0..e1d3d1103 100644
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -22,6 +22,8 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
 
     <application
         android:name=".HabitsApplication"
@@ -29,6 +31,7 @@
         android:backupAgent=".HabitsBackupAgent"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/main_activity_title"
+        android:localeConfig="@xml/locales_config"
         android:supportsRtl="true"
         android:theme="@style/AppBaseTheme">
 
diff --git a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
index 990314a06..f0dcd378a 100644
--- a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
+++ b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
@@ -44,21 +44,21 @@ class AndroidDataView(
         addUpdateListener(this@AndroidDataView)
     }
 
-    override fun onTouchEvent(event: MotionEvent?) = detector.onTouchEvent(event)
-    override fun onDown(e: MotionEvent?) = true
-    override fun onShowPress(e: MotionEvent?) = Unit
+    override fun onTouchEvent(event: MotionEvent) = detector.onTouchEvent(event)
+    override fun onDown(e: MotionEvent) = true
+    override fun onShowPress(e: MotionEvent) = Unit
 
-    override fun onSingleTapUp(e: MotionEvent?): Boolean {
+    override fun onSingleTapUp(e: MotionEvent): Boolean {
         return handleClick(e, true)
     }
 
-    override fun onLongPress(e: MotionEvent?) {
+    override fun onLongPress(e: MotionEvent) {
         handleClick(e)
     }
 
     override fun onScroll(
-        e1: MotionEvent?,
-        e2: MotionEvent?,
+        e1: MotionEvent,
+        e2: MotionEvent,
         dx: Float,
         dy: Float
     ): Boolean {
@@ -79,8 +79,8 @@ class AndroidDataView(
     }
 
     override fun onFling(
-        e1: MotionEvent?,
-        e2: MotionEvent?,
+        e1: MotionEvent,
+        e2: MotionEvent,
         velocityX: Float,
         velocityY: Float
     ): Boolean {
@@ -100,7 +100,7 @@ class AndroidDataView(
         return false
     }
 
-    override fun onAnimationUpdate(animation: ValueAnimator?) {
+    override fun onAnimationUpdate(animation: ValueAnimator) {
         if (!scroller.isFinished) {
             scroller.computeScrollOffset()
             updateDataOffset()
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt
index 509acc067..b69e491fe 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt
@@ -116,7 +116,7 @@ abstract class ScrollableChart : View, GestureDetector.OnGestureListener, Animat
         return BundleSavedState(superState, bundle)
     }
 
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, dx: Float, dy: Float): Boolean {
+    override fun onScroll(e1: MotionEvent, e2: MotionEvent, dx: Float, dy: Float): Boolean {
         var dx = dx
         if (scrollerBucketSize == 0) return false
         if (abs(dx) > abs(dy)) {
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
index a2f329d71..e737deea2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -23,6 +23,7 @@ import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.text.Html
 import android.text.Spanned
@@ -138,6 +139,7 @@ class EditHabitActivity : AppCompatActivity() {
                 binding.targetOuterBox.visibility = View.GONE
                 binding.targetTypeOuterBox.visibility = View.GONE
             }
+
             HabitType.NUMERICAL -> {
                 binding.nameInput.hint = getString(R.string.measurable_short_example)
                 binding.questionInput.hint = getString(R.string.measurable_question_example)
@@ -271,6 +273,14 @@ class EditHabitActivity : AppCompatActivity() {
         habit.description = binding.notesInput.text.trim().toString()
         habit.color = color
         if (reminderHour >= 0) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                requestPermissions(
+                    arrayOf(
+                        android.Manifest.permission.POST_NOTIFICATIONS
+                    ),
+                    1
+                )
+            }
             habit.reminder = Reminder(reminderHour, reminderMin, reminderDays)
         } else {
             habit.reminder = null
diff --git a/uhabits-android/src/main/res/xml/locales_config.xml b/uhabits-android/src/main/res/xml/locales_config.xml
new file mode 100644
index 000000000..a0fefcb50
--- /dev/null
+++ b/uhabits-android/src/main/res/xml/locales_config.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" /> <!-- English -->
+    <locale android:name="af-ZA" /> <!-- Afrikaans -->
+    <locale android:name="ar-SA" /> <!-- Arabic -->
+    <locale android:name="bg-BG" /> <!-- Bulgarian -->
+    <locale android:name="ca-ES" /> <!-- Catalan -->
+    <locale android:name="cs-CZ" /> <!-- Czech -->
+    <locale android:name="da-DK" /> <!-- Danish -->
+    <locale android:name="de-DE" /> <!-- German -->
+    <locale android:name="el-GR" /> <!-- Greek -->
+    <locale android:name="eo-UY" /> <!-- Esperanto -->
+    <locale android:name="es-ES" /> <!-- Spanish -->
+    <locale android:name="eu-ES" /> <!-- Basque -->
+    <locale android:name="fa-IR" /> <!-- Farsi -->
+    <locale android:name="fi-FI" /> <!-- Finnish -->
+    <locale android:name="fr-FR" /> <!-- French -->
+    <locale android:name="hi-IN" /> <!-- Hindi -->
+    <locale android:name="hr-HR" /> <!-- Croatian -->
+    <locale android:name="hu-HU" /> <!-- Hungarian -->
+    <locale android:name="hy-AM" /> <!-- Armenian -->
+    <locale android:name="in-ID" /> <!-- Indonesian -->
+    <locale android:name="it-IT" /> <!-- Italian -->
+    <locale android:name="iw-IL" /> <!-- Hebrew -->
+    <locale android:name="ja-JP" /> <!-- Japanese -->
+    <locale android:name="ko-KR" /> <!-- Korean -->
+    <locale android:name="nl-NL" /> <!-- Dutch -->
+    <locale android:name="no-NO" /> <!-- Norwegian -->
+    <locale android:name="pl-PL" /> <!-- Polish -->
+    <locale android:name="pt-BR" /> <!-- Portuguese (Brazil) -->
+    <locale android:name="pt-PT" /> <!-- Portuguese (Portugal) -->
+    <locale android:name="ro-RO" /> <!-- Romanian -->
+    <locale android:name="ru-RU" /> <!-- Russian -->
+    <locale android:name="sk-SK" /> <!-- Slovak -->
+    <locale android:name="sl-SL" /> <!-- Slovenian -->
+    <locale android:name="sr-CS" /> <!-- Serbian (Latin) -->
+    <locale android:name="sr-SP" /> <!-- Serbian (Cyrillic) -->
+    <locale android:name="sv-SE" /> <!-- Swedish -->
+    <locale android:name="ta-IN" /> <!-- Tamil -->
+    <locale android:name="te-IN" /> <!-- Telugu -->
+    <locale android:name="tr-TR" /> <!-- Turkish -->
+    <locale android:name="ug-CN" /> <!-- Uyghur -->
+    <locale android:name="uk-UA" /> <!-- Ukrainian -->
+    <locale android:name="vi-VN" /> <!-- Vietnamese -->
+    <locale android:name="zh-CN" /> <!-- Chinese (Simplified) -->
+    <locale android:name="zh-TW" /> <!-- Chinese (Traditional) -->
+</locale-config>
\ No newline at end of file