diff --git a/app/build.gradle b/app/build.gradle
index 5e367f4a8..8b5b4034c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,7 +70,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:5a860f5e21'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:6ed2cb04b7'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index e329ed1c4..5b2a7c295 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -31,6 +31,7 @@ import com.simplemobiletools.calendar.pro.adapters.AutoCompleteTextViewAdapter
 import com.simplemobiletools.calendar.pro.dialogs.*
 import com.simplemobiletools.calendar.pro.extensions.*
 import com.simplemobiletools.calendar.pro.helpers.*
+import com.simplemobiletools.calendar.pro.helpers.Formatter
 import com.simplemobiletools.calendar.pro.models.*
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
@@ -41,13 +42,11 @@ import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.commons.views.MyAutoCompleteTextView
 import kotlinx.android.synthetic.main.activity_event.*
-import kotlinx.android.synthetic.main.activity_event.view.event_reminder_2
-import kotlinx.android.synthetic.main.activity_event.view.event_reminder_3
+import kotlinx.android.synthetic.main.activity_event.view.*
 import kotlinx.android.synthetic.main.item_attendee.view.*
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
-import java.util.Calendar
-import java.util.TimeZone
+import java.util.*
 import java.util.regex.Pattern
 
 class EventActivity : SimpleActivity() {
@@ -1317,9 +1316,7 @@ class EventActivity : SimpleActivity() {
                         storeEvent(wasRepeatable)
                     }
                 } else {
-                    PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
-                        openNotificationSettings()
-                    }
+                    PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
                 }
             }
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
index 76f00b5d1..0fd713a1e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
@@ -157,12 +157,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
         addBirthdaysAnniversariesAtStart()
 
         if (isPackageInstalled("com.simplemobiletools.calendar")) {
-            ConfirmationDialog(this, "", R.string.upgraded_to_pro_calendar, R.string.ok, 0, false) {}
+            ConfirmationDialog(this, "", R.string.upgraded_from_free_calendar, R.string.ok, 0, false) {}
         }
 
         addImportIdsToTasks {
             refreshViewPager()
         }
+
+        PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
     }
 
     override fun onResume() {
@@ -1067,9 +1069,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
                         }
                     }
                 } else {
-                    PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
-                        openNotificationSettings()
-                    }
+                    PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
                 }
             }
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt
index b31fad016..d656cede8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt
@@ -85,9 +85,7 @@ open class SimpleActivity : BaseSimpleActivity() {
                     }
                 }
             } else {
-                PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
-                    openNotificationSettings()
-                }
+                PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
index bde5251b6..02652bbb2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
@@ -433,9 +433,7 @@ class TaskActivity : SimpleActivity() {
                         storeTask(wasRepeatable)
                     }
                 } else {
-                    PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
-                        openNotificationSettings()
-                    }
+                    PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
                 }
             }
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt
index 5ab81d478..bdb38ac80 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt
@@ -36,9 +36,7 @@ class SetRemindersDialog(val activity: SimpleActivity, val eventType: Int, val c
                             }
                         }
                     } else {
-                        PermissionRequiredDialog(activity, messageId = R.string.no_post_notifications_permissions) {
-                            activity.openNotificationSettings()
-                        }
+                        PermissionRequiredDialog(activity, R.string.allow_notifications_reminders)
                     }
                 }
             }