diff --git a/..aiexclude b/..aiexclude
index e69de29bb2..e48be01790 100644
--- a/..aiexclude
+++ b/..aiexclude
@@ -0,0 +1,2 @@
+#Exclude everything
+*
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 39229e954e..07284683d2 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintIconLauncherShape" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintTypos" enabled="false" level="WARNING" enabled_by_default="false" editorAttributes="WARNING_ATTRIBUTES" />
     <inspection_tool class="CommentedOutCode" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="IfCanBeSwitch" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="minimumBranches" value="3" />
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml
index eaf28642bb..4b2b63bfd4 100644
--- a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml
+++ b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/src/androidTestDebug" />
@@ -27,40 +27,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.AndroidClearChroma.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.AndroidClearChroma.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml
index 97002f4966..e3c3af0b73 100644
--- a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml
+++ b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml
index 980f876e74..23dfd33271 100644
--- a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml
+++ b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../AndroidClearChroma/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/src/debug" />
     <content url="file://$MODULE_DIR$/../../../AndroidClearChroma/src/main">
@@ -32,39 +35,39 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml
index 13932f904b..e8ad1d8af7 100644
--- a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml
+++ b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml
@@ -24,40 +24,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.AndroidClearChroma.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.AndroidClearChroma.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml
index e9dd694815..e08337e0f4 100644
--- a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml
+++ b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootShell/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../RootShell/src/androidTestDebug" />
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
index 25b89f520a..23e33a07d5 100644
--- a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
+++ b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
index 4e2803d638..37225ab9f9 100644
--- a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
+++ b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootShell/src/debug" />
     <content url="file://$MODULE_DIR$/../../../RootShell/src/main">
diff --git a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.androidTest.iml b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.androidTest.iml
index aef052e96c..f43b42f386 100644
--- a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.androidTest.iml
+++ b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootTools/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../RootTools/src/androidTestDebug" />
@@ -27,40 +27,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.RootTools.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.RootShell.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.RootTools.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml
index 5e6372c136..6459c22b76 100644
--- a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml
+++ b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
index d26961df38..4cd4dfe872 100644
--- a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
+++ b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootTools/src/debug" />
     <content url="file://$MODULE_DIR$/../../../RootTools/src/main">
@@ -31,39 +34,39 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.RootShell.main" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.unitTest.iml b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.unitTest.iml
index 96214f1564..ca4b424b42 100644
--- a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.unitTest.iml
+++ b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.unitTest.iml
@@ -24,40 +24,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.RootTools.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.RootShell.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.RootTools.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.androidTest.iml b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.androidTest.iml
index 1bac86c9c7..79c3d2b8db 100644
--- a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.androidTest.iml
+++ b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.androidTest.iml
@@ -19,47 +19,47 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../ToastCompat/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../ToastCompat/src/androidTestDebug" />
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.ToastCompat.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.ToastCompat.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml
index 33df45ab2d..e9d9ef98e8 100644
--- a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml
+++ b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
index 0f5ac99d65..d429291aa9 100644
--- a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
+++ b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../ToastCompat/src/debug" />
     <content url="file://$MODULE_DIR$/../../../ToastCompat/src/main">
@@ -30,39 +33,39 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.unitTest.iml b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.unitTest.iml
index fd709cc9c6..850378a7c9 100644
--- a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.unitTest.iml
+++ b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.unitTest.iml
@@ -23,40 +23,40 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.ToastCompat.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.ToastCompat.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.androidTest.iml b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.androidTest.iml
index a0712d09ff..0d8f5d160e 100644
--- a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.androidTest.iml
+++ b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/src/androidTestDebug" />
@@ -27,40 +27,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.android-betterpickers.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.android-betterpickers.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml
index 58542e004e..54c26247d6 100644
--- a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml
+++ b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
index 6c4c8fc4e8..ff3047a24b 100644
--- a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
+++ b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/src/debug" />
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/src/main">
@@ -33,39 +36,39 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.unitTest.iml b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.unitTest.iml
index ab544513b5..4ced854b74 100644
--- a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.unitTest.iml
+++ b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.unitTest.iml
@@ -24,40 +24,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.android-betterpickers.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.android-betterpickers.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/common/PhoneProfilesPlus.common.androidTest.iml b/.idea/modules/common/PhoneProfilesPlus.common.androidTest.iml
index 7d2099b582..fc9ed31d9b 100644
--- a/.idea/modules/common/PhoneProfilesPlus.common.androidTest.iml
+++ b/.idea/modules/common/PhoneProfilesPlus.common.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../common/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../common/src/androidTestDebug" />
diff --git a/.idea/modules/common/PhoneProfilesPlus.common.iml b/.idea/modules/common/PhoneProfilesPlus.common.iml
index 32f283ae39..475e98102d 100644
--- a/.idea/modules/common/PhoneProfilesPlus.common.iml
+++ b/.idea/modules/common/PhoneProfilesPlus.common.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/common/PhoneProfilesPlus.common.main.iml b/.idea/modules/common/PhoneProfilesPlus.common.main.iml
index 5164a0c602..24780bd0ba 100644
--- a/.idea/modules/common/PhoneProfilesPlus.common.main.iml
+++ b/.idea/modules/common/PhoneProfilesPlus.common.main.iml
@@ -22,7 +22,7 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../common/src/debug" />
     <content url="file://$MODULE_DIR$/../../../common/src/main">
diff --git a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.androidTest.iml b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.androidTest.iml
index 61bedf95ff..273855106c 100644
--- a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.androidTest.iml
+++ b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.androidTest.iml
@@ -19,47 +19,47 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/src/androidTestDebug" />
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.noobcameraflash.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.noobcameraflash.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml
index 2b49394138..007a4ca65c 100644
--- a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml
+++ b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
index f27cff0f67..4d03d1b4e5 100644
--- a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
+++ b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
@@ -27,9 +27,12 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/src/debug" />
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/src/main">
@@ -37,39 +40,39 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.unitTest.iml b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.unitTest.iml
index b46dc745f8..08baf02165 100644
--- a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.unitTest.iml
+++ b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.unitTest.iml
@@ -23,40 +23,40 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.noobcameraflash.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.noobcameraflash.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.androidTest.iml b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.androidTest.iml
index cf8e18a120..bd87a4cc91 100644
--- a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.androidTest.iml
+++ b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.androidTest.iml
@@ -18,12 +18,17 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debugAndroidTest/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/androidTest/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/src/androidTestDebug" />
@@ -45,14 +50,14 @@
     <orderEntry type="library" scope="TEST" name="Gradle: ch.acra:acra-notification:5.11.3@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.work:work-runtime:2.9.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.startup:startup-runtime:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.exifinterface:exifinterface:1.3.7@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.gridlayout:gridlayout:1.0.0@aar" level="project" />
@@ -60,7 +65,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
@@ -73,15 +78,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.8.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.2.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.palette:palette:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.preference:preference:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.10.0@aar" level="project" />
@@ -100,13 +105,13 @@
     <orderEntry type="library" scope="TEST" name="Gradle: dev.rikka.shizuku:aidl:12.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: dev.rikka.shizuku:shared:12.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: dev.rikka.shizuku:provider:12.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:33.0.0-android" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:33.2.1-android" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:failureaccess:1.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.checkerframework:checker-qual:3.41.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.errorprone:error_prone_annotations:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.j2objc:j2objc-annotations:2.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.checkerframework:checker-qual:3.42.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.errorprone:error_prone_annotations:2.27.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.j2objc:j2objc-annotations:3.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.7.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
@@ -114,12 +119,12 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.resourceinspection:resourceinspection-annotation:1.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.10.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.11.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.apps.dashclock:dashclock-api:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.linkedin.dexmaker:dexmaker:2.28.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.github.simbiose:Encryption:2.0.1" level="project" />
diff --git a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml
index ceca3fcdf9..ce2a7f0463 100644
--- a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml
+++ b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.main.iml b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.main.iml
index 591c59a91c..eaa8d651b8 100644
--- a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.main.iml
+++ b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.main.iml
@@ -22,12 +22,19 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../phoneProfilesPlus/src/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../phoneProfilesPlus/src/debug/java" isTestSource="false" />
@@ -54,14 +61,14 @@
     <orderEntry type="library" name="Gradle: ch.acra:acra-notification:5.11.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.work:work-runtime:2.9.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.startup:startup-runtime:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.exifinterface:exifinterface:1.3.7@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.3.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.12.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.gridlayout:gridlayout:1.0.0@aar" level="project" />
@@ -69,7 +76,7 @@
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
@@ -82,15 +89,15 @@
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.activity:activity:1.8.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.12.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.palette:palette:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.preference:preference:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.10.0@aar" level="project" />
@@ -110,13 +117,13 @@
     <orderEntry type="library" name="Gradle: dev.rikka.shizuku:shared:12.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: dev.rikka.shizuku:provider:12.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.auto.service:auto-service-annotations:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:33.0.0-android" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:33.2.1-android" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:failureaccess:1.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.checkerframework:checker-qual:3.41.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.j2objc:j2objc-annotations:2.8" level="project" />
+    <orderEntry type="library" name="Gradle: org.checkerframework:checker-qual:3.42.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.27.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.j2objc:j2objc-annotations:3.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.7.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
@@ -124,12 +131,12 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.resourceinspection:resourceinspection-annotation:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.10.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.11.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.apps.dashclock:dashclock-api:2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.linkedin.dexmaker:dexmaker:2.28.3" level="project" />
     <orderEntry type="library" name="Gradle: com.github.simbiose:Encryption:2.0.1" level="project" />
diff --git a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.unitTest.iml b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.unitTest.iml
index d7aae424ac..62110d7c4c 100644
--- a/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.unitTest.iml
+++ b/.idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.unitTest.iml
@@ -37,14 +37,14 @@
     <orderEntry type="library" scope="TEST" name="Gradle: ch.acra:acra-notification:5.11.3@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.work:work-runtime:2.9.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.startup:startup-runtime:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.exifinterface:exifinterface:1.3.7@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.12.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.gridlayout:gridlayout:1.0.0@aar" level="project" />
@@ -52,7 +52,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
@@ -65,15 +65,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.8.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.12.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.palette:palette:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.preference:preference:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.material:material:1.10.0@aar" level="project" />
@@ -92,13 +92,13 @@
     <orderEntry type="library" scope="TEST" name="Gradle: dev.rikka.shizuku:aidl:12.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: dev.rikka.shizuku:shared:12.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: dev.rikka.shizuku:provider:12.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:33.0.0-android" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:33.2.1-android" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:failureaccess:1.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.checkerframework:checker-qual:3.41.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.errorprone:error_prone_annotations:2.23.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.j2objc:j2objc-annotations:2.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.checkerframework:checker-qual:3.42.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.errorprone:error_prone_annotations:2.27.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.j2objc:j2objc-annotations:3.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.7.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
@@ -106,12 +106,12 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.resourceinspection:resourceinspection-annotation:1.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.10.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.gson:gson:2.11.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.apps.dashclock:dashclock-api:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.linkedin.dexmaker:dexmaker:2.28.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.github.simbiose:Encryption:2.0.1" level="project" />
diff --git a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.androidTest.iml b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.androidTest.iml
index 722b7af2bd..c7ceff2896 100644
--- a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.androidTest.iml
+++ b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/src/androidTestDebug" />
@@ -27,40 +27,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.recyclerview-fastscroll.main" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.recyclerview-fastscroll.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml
index 86a3d913cc..1d3f4cf680 100644
--- a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml
+++ b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.main.iml b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.main.iml
index 16f4f27642..4f91b8b3f4 100644
--- a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.main.iml
+++ b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/src/debug" />
     <content url="file://$MODULE_DIR$/../../../recyclerview-fastscroll/src/main">
@@ -32,39 +35,39 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.3.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.unitTest.iml b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.unitTest.iml
index e0d94a4afd..7c9cf76ff5 100644
--- a/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.unitTest.iml
+++ b/.idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.unitTest.iml
@@ -24,40 +24,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.recyclerview-fastscroll.main" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.3.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.recyclerview-fastscroll.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.androidTest.iml b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.androidTest.iml
index 30c43bc5b2..5305e87c36 100644
--- a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.androidTest.iml
+++ b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.androidTest.iml
@@ -19,7 +19,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/androidTest/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/src/androidTest" />
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/src/androidTestDebug" />
@@ -27,40 +27,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.time-duration-picker.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.time-duration-picker.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml
index b965cf663c..e38aa1d8a8 100644
--- a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml
+++ b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.4.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.4.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.5.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
index 3bd90d3103..45c80520c7 100644
--- a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
+++ b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
@@ -20,9 +20,12 @@
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/debug" type="java-resource" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/src/debug" />
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/src/main">
@@ -32,39 +35,39 @@
     <orderEntry type="jdk" jdkName="Android API 34, extension level 7 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.unitTest.iml b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.unitTest.iml
index e4f6b385b3..16debe7f5e 100644
--- a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.unitTest.iml
+++ b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.unitTest.iml
@@ -24,40 +24,40 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.time-duration-picker.main" scope="TEST" />
     <orderEntry type="module" module-name="PhoneProfilesPlus.common.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.6.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.6.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.5.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.7.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.4.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.5.1@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.6.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.13.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.appcompat:appcompat-resources:1.7.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.3.6@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.5.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-jvm:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="PhoneProfilesPlus.time-duration-picker.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 0000000000..0d3a1fbb14
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q2q" />
+          <option name="id" value="q2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold3" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1768" />
+          <option name="screenY" value="2208" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="x1q" />
+          <option name="id" value="x1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S20" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/AndroidClearChroma/build.gradle b/AndroidClearChroma/build.gradle
index 54bc2b6973..c8a0c2e362 100644
--- a/AndroidClearChroma/build.gradle
+++ b/AndroidClearChroma/build.gradle
@@ -34,10 +34,14 @@ android {
 dependencies {
     //implementation fileTree(include: ['*.jar'], dir: 'libs')
     api project(':common')
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
+
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
+
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
 }
 
diff --git a/README.md b/README.md
index a115e3e9e9..572c09791b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 PhoneProfilesPlus (PPP)
 ===========================
 
-[![version](https://img.shields.io/badge/version-6.5-blue)](https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5)
+[![version](https://img.shields.io/badge/version-6.5.1-blue)](https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5.1)
 [![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
 [![License](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/henrichg/PhoneProfilesPlus/blob/master/LICENSE)
 [![Crowdin](https://badges.crowdin.net/phoneprofilesplus/localized.svg)](https://crowdin.com/project/phoneprofilesplus)
diff --git a/RootTools/build.gradle b/RootTools/build.gradle
index ab8a8003ff..085b5c71bc 100644
--- a/RootTools/build.gradle
+++ b/RootTools/build.gradle
@@ -30,9 +30,12 @@ android {
 dependencies {
     implementation project(':RootShell')
 
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
+
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
 }
diff --git a/ToastCompat/build.gradle b/ToastCompat/build.gradle
index 55eb15e600..5623f62a16 100644
--- a/ToastCompat/build.gradle
+++ b/ToastCompat/build.gradle
@@ -27,9 +27,12 @@ android {
 }
 
 dependencies {
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
+
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
 }
diff --git a/android-betterpickers/build.gradle b/android-betterpickers/build.gradle
index 788aff9475..c3dd8df9b4 100644
--- a/android-betterpickers/build.gradle
+++ b/android-betterpickers/build.gradle
@@ -29,12 +29,15 @@ android {
 dependencies {
     //compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
 
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
+
     implementation project(':common')
 }
 
diff --git a/build.gradle b/build.gradle
index a8d555298d..f3847a01bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 //        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         //classpath 'com.google.gms:google-services:4.3.4' // google-services plugin
         //classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     }
diff --git a/common/src/main/res/values-ar/strings.xml b/common/src/main/res/values-ar/strings.xml
index 9b602ce7a1..9c42583e40 100644
--- a/common/src/main/res/values-ar/strings.xml
+++ b/common/src/main/res/values-ar/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">قائمة_تعديل_أنماط</string>
     <string name="menu_settings">قائمة_إعدادات</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">عنوان_أنشطة_نمط_مفضلات</string>
     <string name="title_activity_event_preferences">عنوان_أنشطة_حدث_مفضلات</string>
     <string name="menu_new_profile">قائمة_جديد_نمط</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">فتح التناوب التلقائي</string>
     <string name="array_pref_auto_rotate_off">غلق التناوب التلقائي</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">قد لا يعمل تغيير مستوى التكيف على جهازك (على سبيل المثال: أجهزة Samsung).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">الشبكة الخلوية المتصلة:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">عدد الأبراج الخلوية الجديدة:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">اتصل:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">يقوم بعرض وضع نشط مع مؤشر الإعدادات. يفتح المنشط في اللمس.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">استخدم إضائة الأيقونة لرموز الوضع</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) لمبة الإشعارات</string>
+    <string name="profile_preferences_notificationLed_23">لمبة الإشعارات</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-b+sr+Latn/strings.xml b/common/src/main/res/values-b+sr+Latn/strings.xml
index de277f1939..5cfa1f969e 100644
--- a/common/src/main/res/values-b+sr+Latn/strings.xml
+++ b/common/src/main/res/values-b+sr+Latn/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Urednik</string>
     <string name="menu_settings">Podešavanja</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Podešavanje profila</string>
     <string name="title_activity_event_preferences">Podešavanje događaja</string>
     <string name="menu_new_profile">Novi profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatska rotacija Uključeno</string>
     <string name="array_pref_auto_rotate_off">Automatska rotacija isključena</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Promena prilagodljivog nivoa možda neće da radi na vašem uređaju (primer: Samsung-ovi uređaji).</string>
-    <string name="about_application_xda_developers_community">XDA-developers zajednica:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Konektovana ćelija:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Konektovanje mobilne ćelije zahteva određene dozvole.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Broj novih ćelija:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemi:</string>
     <string name="important_info_email_body_questions">Pitanja:</string>
     <string name="important_info_email_body_suggestions">Sugestije:</string>
-    <string name="about_application_support">Podrška:</string>
-    <string name="about_application_support2">kontakt:</string>
     <string name="about_application_support_subject">podrška</string>
     <string name="dashclock_extension_description">Prikazuje aktivni profil sa indikatorom podešavanja. Otvara Aktivator na dodir.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Koristite lakoću ikona za prilagođene ikone profila</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED Obaveštenja</string>
+    <string name="profile_preferences_notificationLed_23">LED Obaveštenja</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Uvek uključen ekran</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-bg/strings.xml b/common/src/main/res/values-bg/strings.xml
index 5102ff6c62..332dc9df20 100644
--- a/common/src/main/res/values-bg/strings.xml
+++ b/common/src/main/res/values-bg/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Редактор</string>
     <string name="menu_settings">Настройки</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Настройки на Профила</string>
     <string name="title_activity_event_preferences">Настройки на Събитие</string>
     <string name="menu_new_profile">Нов профил</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-bn-rIN/strings.xml b/common/src/main/res/values-bn-rIN/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-bn-rIN/strings.xml
+++ b/common/src/main/res/values-bn-rIN/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ca/strings.xml b/common/src/main/res/values-ca/strings.xml
index a4db7b3847..c90676fdc9 100644
--- a/common/src/main/res/values-ca/strings.xml
+++ b/common/src/main/res/values-ca/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Configuració</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferències de perfil</string>
     <string name="title_activity_event_preferences">Preferències d\'esdeveniment</string>
     <string name="menu_new_profile">Nou perfil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Mostra un perfil actiu amb indicador de preferències. Obre activador al tacte.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-cs/strings.xml b/common/src/main/res/values-cs/strings.xml
index 9c87d62cbb..e4df2db412 100644
--- a/common/src/main/res/values-cs/strings.xml
+++ b/common/src/main/res/values-cs/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Nastavení</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Parametry profilu</string>
     <string name="title_activity_event_preferences">Parametry události</string>
     <string name="menu_new_profile">Nový profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Zapnout automatickou orientaci</string>
     <string name="array_pref_auto_rotate_off">Vypnout automatickou orientaci</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Změna úrovně adaptivního jasu nemusí fungovat na vašem zařízení (například: zařízení Samsung).</string>
-    <string name="about_application_xda_developers_community">Komunita XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Připojená buňka:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Registrace mobilních buněk vyžaduje určitá povolení.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Počet nových buněk:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problémy:</string>
     <string name="important_info_email_body_questions">Otázky:</string>
     <string name="important_info_email_body_suggestions">Návrhy:</string>
-    <string name="about_application_support">Podpora:</string>
-    <string name="about_application_support2">kontakt:</string>
     <string name="about_application_support_subject">podpora</string>
     <string name="dashclock_extension_description">Zobrazí aktivní profil s indikátorem preferencí profilu. Na kliknutí se otevře Aktivátor.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Použít světlost ikony pro vlastní ikony</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings není nainstalován!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">není nainstalováno PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Zdrojový kód - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notifikační LED dioda</string>
+    <string name="profile_preferences_notificationLed_23">Notifikační LED dioda</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On displej</string>
     <string name="samsung_edge_panel_settings_description">Nastavení pro Samsung boční panel</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Kompaktní mřížka</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi a Bluetooth potvrzovací dialogy</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Pro \"HyperOs\" lze tyto dialogy vypnout. Klepnutím na toto je zakážete. POZNÁMKA: Vyžaduje Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">V zařízeních Huawei je chyba. A z tohoto důvodu nemusí správně fungovat všechny neinteraktivní typy.</string>
+    <string name="menu_check_releases_neostore">Zkontrolovat v Neo Store</string>
+    <string name="check_releases_open_neostore">Otevřít Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">Vydání PhoneProfilesPlus v Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Prosím zapněte Polohu a \"Vyhledávání přes Wi-Fi\" v nastavení systému. Bez toho senzor nebude fungovat.</string>
+    <string name="download_installWithOptions_title">Stahování InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Stahování PPPPutSettings.apk</string>
+    <string name="downloading_file_description">Soubor bude uložen do adresáře Downloads</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Některé parametry nejsou nakonfigurovány!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Tyto parametry musí být nakonfigurovány pro správnou funkčnost události.</string>
+    <string name="downloading_toast_text">Stahuje se…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Informace o Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Klepnutím sem zobrazíte informace o Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget je zastaralý a není v Google Play, ale lze nainstalovat nejnovější verzi z APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">Stažení z APKMirror:</string>
+    <string name="shortcut_to_editor_dialog_title">Odkaz na Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Odkaz na \"Skenování mobilních buněk\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Odkaz na \"Číst NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Název ikony odkazu:</string>
+    <string name="shortcut_to_dialog_create_button">Vytořit</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Sken buněk</string>
+    <string name="read_nfc_tag_short_shortcut_name">Číst tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Většina zařízení má sloučeno \"Hlasitost vyzvánění\" a \"Hlasitost systému\". Tato zařízení nemají v Nastavení zařízení možnost konfigurovat \"Hlasitost systému\". Proto je doporučeno nakonfigurovat \"Hlasitost vyzvánění\", když je nakonfigurována \"Hlasitost systému\" nebo nekonfigurovat \"Hlasitost systému\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Zapnutí/vypnutí SIM</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">UPOZORNĚNÍ: Zobrazí se obrazovka pro zadání kódu PIN pro kartu SIM, která je nakonfigurována jako \"Zapnout\".</string>
+    <string name="menu_discord_server">Server PhoneProfilesPlus</string>
+    <string name="menu_discord_invitation">Pozvánka na server PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-da/strings.xml b/common/src/main/res/values-da/strings.xml
index d890b2309a..941e17d402 100644
--- a/common/src/main/res/values-da/strings.xml
+++ b/common/src/main/res/values-da/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Redigeringsværktøj</string>
     <string name="menu_settings">Indstillinger</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profil præferencer</string>
     <string name="title_activity_event_preferences">Begivenhedsindstillinger</string>
     <string name="menu_new_profile">Ny profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index 2a9e2730df..2148a14b94 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Einstellungen</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profil-Einstellungen</string>
     <string name="title_activity_event_preferences">Ereignis-Einstellungen</string>
     <string name="menu_new_profile">Neues Profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Bildschirm drehen an</string>
     <string name="array_pref_auto_rotate_off">Bildschirm drehen aus</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Die Änderung des adaptiven Helligkeitsbereich könnte auf ihrem Gerät nicht funktionieren (Beispiel: Samsung Geräte).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Verbundene Mobilfunkzelle:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobilzellen Einstellung benötigt Berechtigungen.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Anzahl neuer Zellen:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Probleme:</string>
     <string name="important_info_email_body_questions">Fragen:</string>
     <string name="important_info_email_body_suggestions">Vorschläge:</string>
-    <string name="about_application_support">Unterstützung:</string>
-    <string name="about_application_support2">Kontakt:</string>
     <string name="about_application_support_subject">Unterstützung</string>
     <string name="dashclock_extension_description">Aktives Profil mit Eigenschaften-Symbolen anzeigen. Anklicken, um den Starter zu öffnen.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Helligkeit der Symbole für benutzerdefinierte Profil-Symbole verwenden</string>
@@ -1712,37 +1708,37 @@
     <string name="profile_preferences_red_texts_text_3_new">Hierfür ist es nicht möglich, „Im Aktivator anzeigen” zu ändern.</string>
     <string name="profile_preferences_red_texts_text_4">Fehler werden in den Profileinstellungen als rote Texte am oberen Rand des Einstellungsbildschirms angezeigt. Bitte beheben Sie diese.</string>
     <string name="event_preferences_red_texts_text_4">Fehler werden in den Ereigniseinstellungen als roter Text am oberen Rand des Einstellungsbildschirms angezeigt. Bitte beheben Sie diese.</string>
-    <string name="profile_preferences_savedProfilePreferences_title_new">Configured profile preferences</string>
-    <string name="profile_preferences_savedProfilePreferences_summary_new">Click here to show configured profile preferences.</string>
-    <string name="phone_profiles_pref_notificationProfileIconColor">Profile icon and preferences indicator color type</string>
-    <string name="phone_profiles_pref_notificationProfileIconLightness">Profile icon lightness</string>
-    <string name="phone_profiles_pref_notificationProfileCustomIconLightness">Use profile icon lightness for custom profile icons</string>
-    <string name="phone_profiles_pref_notificationBackgroundColorCategory">Notification panel - background color</string>
-    <string name="phone_profiles_pref_notificationTextColorCategory">Notification panel - text color</string>
-    <string name="phone_profiles_pref_notificationProfileIconCategory">Notification panel - profile icon</string>
-    <string name="phone_profiles_pref_notificationPreferencesIndicatorCategory">Notification panel - preferences indicator</string>
-    <string name="phone_profiles_pref_notificationButtonsCategory">Notification panel - buttons</string>
+    <string name="profile_preferences_savedProfilePreferences_title_new">Konfigurierte Profileinstellungen</string>
+    <string name="profile_preferences_savedProfilePreferences_summary_new">Klicken Sie hier, um die konfigurierten Profileinstellungen anzuzeigen.</string>
+    <string name="phone_profiles_pref_notificationProfileIconColor">Profilsymbol und Farbtyp der Einstellungsanzeige</string>
+    <string name="phone_profiles_pref_notificationProfileIconLightness">Profilbild-Helligkeit</string>
+    <string name="phone_profiles_pref_notificationProfileCustomIconLightness">Helligkeit der Profilsymbole für benutzerdefinierte Profilsymbole verwenden</string>
+    <string name="phone_profiles_pref_notificationBackgroundColorCategory">Benachrichtigungsfenster - Hintergrundfarbe</string>
+    <string name="phone_profiles_pref_notificationTextColorCategory">Benachrichtigungsfenster - Textfarbe</string>
+    <string name="phone_profiles_pref_notificationProfileIconCategory">Benachrichtigungsfenster - Profilsymbol</string>
+    <string name="phone_profiles_pref_notificationPreferencesIndicatorCategory">Benachrichtigungsfenster - Einstellungsanzeige</string>
+    <string name="phone_profiles_pref_notificationButtonsCategory">Benachrichtigungsfenster - Schaltflächen</string>
     <string name="editor_activity_targetHelps_bottomNavigation_title">Display changer</string>
     <string name="editor_activity_targetHelps_bottomNavigation_description">Click this to change display between profiles list and events list.</string>
-    <string name="profile_icon_preference_custumIconFromIconPack_help">Custom icon from icon pack</string>
-    <string name="profile_icon_preference_custumIconFromIconPack_help_info_1">If you want to use icons from icon pack, install application, which has capability to extract icons from installed icon pack as png files.</string>
+    <string name="profile_icon_preference_custumIconFromIconPack_help">Benutzerdefiniertes Symbol aus dem Symbolpaket</string>
+    <string name="profile_icon_preference_custumIconFromIconPack_help_info_1">Wenn Sie Symbole aus dem Symbolpaket verwenden möchten, installieren Sie eine Anwendung, mit der Sie Symbole aus dem installierten Symbolpaket als png-Dateien extrahieren können.</string>
     <string name="profile_icon_preference_custumIconFromIconPack_help_info_2">For example application</string>
-    <string name="profile_icon_preference_custumIconFromIconPack_help_info_3">It is old, but functional application also in newest Android version.</string>
-    <string name="profile_icon_preference_custumIconFromIconPack_help_info_4">Search it in Google Play.</string>
-    <string name="popup_window_close_button_name">Close</string>
-    <string name="profile_preferences_indicator_image">Profile preferences indicator</string>
+    <string name="profile_icon_preference_custumIconFromIconPack_help_info_3">Es ist eine alte, aber funktionale Anwendung auch in der neuesten Android-Version.</string>
+    <string name="profile_icon_preference_custumIconFromIconPack_help_info_4">Suchen Sie es in Google Play.</string>
+    <string name="popup_window_close_button_name">Schließen</string>
+    <string name="profile_preferences_indicator_image">Indikator für Profileinstellungen</string>
     <string name="profile_preferences_indicator_event_start_image">Start of event profile preferences indicator</string>
     <string name="profile_preferences_indicator_event_end_image">End of event profile preferences indicator</string>
-    <string name="configured_profile_preferences_preference_icon_image">Profile preference icon</string>
-    <string name="important_infor_traffic_light_icon">Traffic light icon</string>
+    <string name="configured_profile_preferences_preference_icon_image">Symbol für Profileinstellungen</string>
+    <string name="important_infor_traffic_light_icon">Ampel-Symbol</string>
     <string name="opaqueness_lightnig_preference_list_item_icon">Opaqueness/lightning icon</string>
-    <string name="preference_widget_application_icon">Selected application icon</string>
-    <string name="preference_widget_color_chooser_icon">Selected color</string>
+    <string name="preference_widget_application_icon">Symbol der ausgewählten Anwendung</string>
+    <string name="preference_widget_color_chooser_icon">Ausgewählte Farbe</string>
     <string name="preference_widget_opaqueness_lightnig_icon">Selected opaqueness/lightning</string>
     <string name="preference_widget_exclamation_icon">Exclamation</string>
-    <string name="preference_widget_image_icon">Selected image</string>
+    <string name="preference_widget_image_icon">Ausgewähltes Foto</string>
     <string name="preference_widget_information_icon">Information</string>
-    <string name="preference_widget_information_clickable_icon">Information, clickable</string>
+    <string name="preference_widget_information_clickable_icon">Informationen, anklickbar</string>
     <string name="preference_widget_clickabe_prefernce_icon">Clickable preference with sub preferences</string>
     <string name="required_extender_release">Neue Version von PhoneProfilesPlusExtender</string>
     <string name="required_extender_release_notification">Klicken Sie auf diese Mitteilung, um die neue Version von PhoneProfilesPlusExtender zu installieren.</string>
@@ -1758,11 +1754,11 @@
     <string name="phone_profiles_pref_applicationWifiControlInfo_summary">Der spezielle Zugang „WLAN-Steuerung” muss erlaubt sein. Er ist erforderlich, um WLAN zu aktivieren und zu deaktivieren. Klicken Sie hier, um eine Anleitung anzuzeigen.</string>
     <string name="phone_profiles_pref_applicationWifiControlInfo_message">Der spezielle Zugang „WLAN-Steuerung” muss erlaubt sein. Er ist erforderlich, um WLAN zu aktivieren und zu deaktivieren.\n\nIn den Geräteeinstellungen erlauben Sie „Apps”/„Spezieller App-Zugang”/„WLAN-Steuerung” für PhoneProfilesPlus.</string>
     <string name="phone_profiles_pref_applicationWifiControlInfo_showButton">Geräteeinstellungen anzeigen</string>
-    <string name="important_info_profile_grant_1_howTo_20_1">NOTE:</string>
-    <string name="important_info_profile_grant_1_howTo_20_2">For some devices must be in Developer options enabled:</string>
-    <string name="important_info_profile_grant_1_howTo_20_3">Xiaomi: \"USB debugging (Security settings)\".</string>
-    <string name="important_info_profile_grant_1_howTo_20_4">Oppo, OnePlus: \"Disable permission monitoring\".</string>
-    <string name="important_info_profile_grant_1_howTo_20_5">Maybe similar option exists in another devices.</string>
+    <string name="important_info_profile_grant_1_howTo_20_1">Hinweis:</string>
+    <string name="important_info_profile_grant_1_howTo_20_2">Bei einigen Geräten müssen die Entwickleroptionen aktiviert sein:</string>
+    <string name="important_info_profile_grant_1_howTo_20_3">Xiaomi: „USB-Debugging (Sicherheitseinstellungen)”.</string>
+    <string name="important_info_profile_grant_1_howTo_20_4">Oppo, OnePlus: „Berechtigungsüberwachung deaktivieren”.</string>
+    <string name="important_info_profile_grant_1_howTo_20_5">Vielleicht gibt es eine ähnliche Option in anderen Geräten.</string>
     <string name="important_info_profile_grant_1_howTo_20_6">Without this, grant not working.</string>
     <string name="phone_profiles_pref_applicationEventWifiScanThrottling">Wi-Fi scan throttling</string>
     <string name="phone_profiles_pref_applicationEventWifiScanThrottling_summary">Click here to display how to disable Wi-Fi scan throttling, to allow scanning with interval less then 30 minutes.</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Benachrichtigungs-LED</string>
+    <string name="profile_preferences_notificationLed_23">Benachrichtigungs-LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Display immer eingeschaltet</string>
     <string name="samsung_edge_panel_settings_description">Samsung Seitenleiste (Edge Panel) Einstellungen</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Kompaktes Raster</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) WLAN- und Bluetooth-Bestätigungsdialoge</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Für „HyperOs“ ist es möglich, diese Dialoge zu deaktivieren. Klicken Sie darauf, um sie zu deaktivieren. HINWEIS: Es erfordert Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">Bei Huawei-Geräten liegt ein Fehler vor. Aus diesem Grund funktionieren möglicherweise nicht alle nicht-interaktiven Typen ordnungsgemäß.</string>
+    <string name="menu_check_releases_neostore">Im Neo Store anzeigen</string>
+    <string name="check_releases_open_neostore">Neo Store öffnen</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus Veröffentlichung im Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Einige Parameter sind nicht konfiguriert!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Diese Parameter müssen für eine ordnungsgemäße Ereignisfunktionalität konfiguriert werden.</string>
+    <string name="downloading_toast_text">Wird heruntergeladen …</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Informationen über Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Klicken Sie hier, um Informationen über das Widget Dash Clock anzuzeigen.</string>
+    <string name="dash_clock_widget_info_1">Das Widget Dash Clock ist veraltet und ist nicht in Google Play verfügbar. Dennoch ist es möglich, die neueste Version von APKMirror zu installieren.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget auf GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror herunterladen:</string>
+    <string name="shortcut_to_editor_dialog_title">Verknüpfung zum Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Verknüpfung zu „Mobilfunkzellen scannen”</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Verknüpfung zu „NFC-Tag lesen”</string>
+    <string name="shortcut_to_dialog_lablel">Name des Verknüpfungssymbols:</string>
+    <string name="shortcut_to_dialog_create_button">Erstellen</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Zellen scannen</string>
+    <string name="read_nfc_tag_short_shortcut_name">Tag lesen</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Bei den meisten Geräten wurden die „Klingeltonlautstärke” und die „Systemlautstärke” zusammengelegt. Diese Geräte haben keine Option in den Geräteeinstellungen, um die „Systemlautstärke” zu konfigurieren. Aus diesem Grund wird empfohlen, die „Klingeltonlautstärke\" zu konfigurieren, wenn die „Systemlautstärke” konfiguriert ist, oder die „Systemlautstärke” nicht zu konfigurieren.</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">SIM wechseln (Ein/Aus)</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">ACHTUNG: Es wird der Bildschirm zur Eingabe des PIN-Codes für die SIM-Karte angezeigt, die als „Ein“ konfiguriert ist.</string>
+    <string name="menu_discord_server">PhoneProfilesPlus-Server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus-Server-Einladung</string>
 </resources>
diff --git a/common/src/main/res/values-el/strings.xml b/common/src/main/res/values-el/strings.xml
index 6927ddf5b9..27376cb522 100644
--- a/common/src/main/res/values-el/strings.xml
+++ b/common/src/main/res/values-el/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Επεξεργασία</string>
     <string name="menu_settings">Ρυθμίσεις</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Προτιμήσεις προφίλ</string>
     <string name="title_activity_event_preferences">Προτιμήσεις Γεγονότος</string>
     <string name="menu_new_profile">Νέο προφίλ</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Εμφανίζει το ενεργό προφίλ με ένδειξη επιλογών. Ανοίγει τον Ενεργοποιητή με το άγγιγμα.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index 83db61e13c..9ab4127300 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Ajustes</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferencias de perfil</string>
     <string name="title_activity_event_preferences">Preferencias de evento</string>
     <string name="menu_new_profile">Nuevo perfil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Rotación automática activada</string>
     <string name="array_pref_auto_rotate_off">Rotación automática desactivada</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">El cambio de nivel de adaptación puede no funcionar en tu dispositivo (por ejemplo: dispositivos Samsung).</string>
-    <string name="about_application_xda_developers_community">Comunidad de desarrolladores XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Celda conectada:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">El escaneo de celdas móviles requiere algunos permisos.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Número de celdas nuevas:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemas:</string>
     <string name="important_info_email_body_questions">Preguntas:</string>
     <string name="important_info_email_body_suggestions">Sugerencias:</string>
-    <string name="about_application_support">Soporte:</string>
-    <string name="about_application_support2">contacto:</string>
     <string name="about_application_support_subject">soporte</string>
     <string name="dashclock_extension_description">Muestra el perfil activo con el indicador de preferencias. Abre el activador al pulsar.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Usar luminosidad de iconos para iconos de perfil personalizados</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings no está instalado!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">PPPPutSettings no instalado</string>
     <string name="about_application_pppps_source_code">Código fuente - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED de Notificación</string>
+    <string name="profile_preferences_notificationLed_23">LED de Notificación</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) pantalla siempre encendida</string>
     <string name="samsung_edge_panel_settings_description">Ajustes del panel de Samsung edge</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Cuadrícula Compacta</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) diálogos de confirmación de Wi-Fi y Bluetooth</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Es posible desactivar estos diálogos para \"HyperOs\". Haz clic en esto para desactivarlos. NOTA: Requiere Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">En los dispositivos Huawei hay un bug y por esta razón puede que no funcionen correctamente todos los tipos no interactivos.</string>
+    <string name="menu_check_releases_neostore">Comprobar en la Neo Store</string>
+    <string name="check_releases_open_neostore">Abrir Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">Versión de PhoneProfilesPlus en Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Por favor, activa la localización y el escaneo Wi-Fi en los ajustes de sistema. Sin esto, el sensor no funcionará.</string>
+    <string name="download_installWithOptions_title">Descarga de InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Descarga de PPPPutSettings.apk</string>
+    <string name="downloading_file_description">El archivo se almacenará en el directorio de descargas</string>
+    <string name="event_preferences_not_all_parameters_are_configured">¡Algunos parámetros no están configurados!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Estos parámetros deben estar configurados para que los eventos funcionen correctamente.</string>
+    <string name="downloading_toast_text">Descargando…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Reloj Dash</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Información sobre el Reloj Dash</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Haz clic aquí para mostrar información sobre Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget está obsoleto y no está en Google Play, pero es posible instalar la última versión desde APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">Descarga de APKMirror:</string>
+    <string name="shortcut_to_editor_dialog_title">Acceso directo al editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Acceso directo a \"Escaneo móvil de celdas\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Acceso directo a \"Leer etiqueta NFC\"</string>
+    <string name="shortcut_to_dialog_lablel">Nombre del icono de acceso directo:</string>
+    <string name="shortcut_to_dialog_create_button">Crear</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Escanear celdas</string>
+    <string name="read_nfc_tag_short_shortcut_name">Leer etiqueta</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">La mayoría de los dispositivos han combinado \"Volumen de tono\" y \"Volumen del Sistema\". Estos dispositivos no tienen opción en la configuración del dispositivo para configurar \"Volumen del Sistema\". Por esta razón, se recomienda configurar \"Volumen de tono\", cuando está configurado \"Volumen del sistema\" o no configurar \"Volumen del sistema\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Activar/desactivar SIM</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">ADVERTENCIA: Esto activa la pantalla de entrada de código PIN para la tarjeta SIM que está configurada como «On».</string>
+    <string name="menu_discord_server">Servidor PhoneProfilesPlus</string>
+    <string name="menu_discord_invitation">Invitación al servidor PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-et/strings.xml b/common/src/main/res/values-et/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-et/strings.xml
+++ b/common/src/main/res/values-et/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-fa/strings.xml b/common/src/main/res/values-fa/strings.xml
index f9b33b318b..ddd11358d6 100644
--- a/common/src/main/res/values-fa/strings.xml
+++ b/common/src/main/res/values-fa/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">ویرایشگر</string>
     <string name="menu_settings">تنظیمات</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">تنظیمات نمایه</string>
     <string name="title_activity_event_preferences">تنظیمات رویداد</string>
     <string name="menu_new_profile">نمایه جدید</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">نمایش دهنده نمایه فعال با نشان گر مشخصات، با لمس فعال ساز اجرا شود.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-fi/strings.xml b/common/src/main/res/values-fi/strings.xml
index 9724277ba6..d31b7b79aa 100644
--- a/common/src/main/res/values-fi/strings.xml
+++ b/common/src/main/res/values-fi/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editori</string>
     <string name="menu_settings">Asetukset</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profiili valinnat</string>
     <string name="title_activity_event_preferences">Tapahtuma valinnat</string>
     <string name="menu_new_profile">Uusi profiili</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 4a58fe29f6..fbf85defd7 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Éditeur</string>
     <string name="menu_settings">Paramètres</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Préférences du profil</string>
     <string name="title_activity_event_preferences">Préférences de l\'événement</string>
     <string name="menu_new_profile">Nouveau profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Rotation automatique active</string>
     <string name="array_pref_auto_rotate_off">Rotation automatique inactive</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Cle changement de niveau adaptatif peut ne pas fonctionner sur votre appareil (exemple : appareils Samsung).</string>
-    <string name="about_application_xda_developers_community">Communauté XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Antennes-relais connectées :</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">L\'enregistrement des antennes-relais requiert certaines permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Nouvelles antennes-relais :</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problèmes:</string>
     <string name="important_info_email_body_questions">Question :</string>
     <string name="important_info_email_body_suggestions">Suggestions :</string>
-    <string name="about_application_support">Support :</string>
-    <string name="about_application_support2">contact :</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Affiche le profil actif avec indicateur de préférences. Ouvre l\’activateur sur contact. </string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Utiliser les icônes claires pour le profil personnalisé</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings n\'est pas installé !</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">PPPPutSettings n\'est pas installé</string>
     <string name="about_application_pppps_source_code">Code source - PPPPutSettings :</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED de notification</string>
+    <string name="profile_preferences_notificationLed_23">LED de notification</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Affichage permanent</string>
     <string name="samsung_edge_panel_settings_description">Paramètres du panneau de bord Samsung</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Grille compacte</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Boîtes de dialogue de confirmation Wi-Fi et Bluetooth</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Pour \"HyperOs\", il est possible de désactiver ces boîtes de dialogue. Cliquez dessus pour les désactiver. REMARQUE : cela nécessite Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">Il y a un bug sur les appareils Huawei. Pour cette raison, tous les types non interactifs peuvent ne pas fonctionner correctement.</string>
+    <string name="menu_check_releases_neostore">Enregistrez-vous dans Neo Store</string>
+    <string name="check_releases_open_neostore">Ouvrir Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">Nouvelle version de PhoneProfilesPlus dans Neo Store :</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Veuillez activer la localisation et « Analyse Wi-Fi » dans les paramètres système. Sans cela, le capteur ne fonctionnera pas.</string>
+    <string name="download_installWithOptions_title">Téléchargement de InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Téléchargement de PPPPutSettings.apk</string>
+    <string name="downloading_file_description">Le fichier sera stocké dans le répertoire Téléchargements</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Certains paramètres ne sont pas configurés !</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Ces paramètres doivent être configurés pour une fonctionnalité d\'événement appropriée.</string>
+    <string name="downloading_toast_text">Téléchargement…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget : Horloge du tableau de bord</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Informations sur l\'horloge du tableau de bord</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Cliquez ici pour afficher des informations sur le widget Horloge du tableau de bord.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget est obsolète et n\'est pas dans Google Play, mais il est possible d\'installer la dernière version à partir d\'APKMirror.</string>
+    <string name="dash_clock_widget_info_2">GitHub de Dash Clock Widget :</string>
+    <string name="dash_clock_widget_info_3">Téléchargement depuis APKMirror :</string>
+    <string name="shortcut_to_editor_dialog_title">Raccourci vers l\'éditeur</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Raccourci vers \"Analyse des antennes relais\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Raccourci vers « Lire le tag NFC »</string>
+    <string name="shortcut_to_dialog_lablel">Nom de l\'icône de raccourci :</string>
+    <string name="shortcut_to_dialog_create_button">Créer</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Scan du réseau cellulaire</string>
+    <string name="read_nfc_tag_short_shortcut_name">Lire le tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">La plupart des appareils ont fusionné le \"Volume de la sonnerie\" et le \"Volume du système\". Ces appareils n\'ont pas d\'option dans les paramètres de l\'appareil pour configurer le \"Volume système\". Pour cette raison, il est recommandé de configurer le \"Volume de sonnerie\" lorsque le \"Volume système\" est configuré ou de ne pas configurer le \"Volume système\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Activer/désactiver la carte SIM</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">AVERTISSEMENT : Ceci affiche l\'écran de saisie du code PIN de la carte SIM qui est configuré comme « Activé ».</string>
+    <string name="menu_discord_server">Serveur PhoneProfilesPlus</string>
+    <string name="menu_discord_invitation">Invitation du serveur PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-ga-rIE/strings.xml b/common/src/main/res/values-ga-rIE/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-ga-rIE/strings.xml
+++ b/common/src/main/res/values-ga-rIE/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-hi/strings.xml b/common/src/main/res/values-hi/strings.xml
index 378f93db58..67d298156b 100644
--- a/common/src/main/res/values-hi/strings.xml
+++ b/common/src/main/res/values-hi/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">संपादक</string>
     <string name="menu_settings">सेटिंग</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">प्रोफ़ाइल प्राथमिकताएं</string>
     <string name="title_activity_event_preferences">इवेंट प्राथमिकताएं</string>
     <string name="menu_new_profile">नई प्रोफ़ाइल</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">प्राथमिकताएं संकेतक के साथ सक्रिय प्रोफ़ाइल प्रदर्शित करता है । स्पर्श पर उत्प्रेरक खोलता है ।</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-hr/strings.xml b/common/src/main/res/values-hr/strings.xml
index 79c6e982b2..4550cc707c 100644
--- a/common/src/main/res/values-hr/strings.xml
+++ b/common/src/main/res/values-hr/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Urednik</string>
     <string name="menu_settings">Postavke</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Podešavanje profila</string>
     <string name="title_activity_event_preferences">Podešavanje događaja</string>
     <string name="menu_new_profile">Novi profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatska rotacija Uključeno</string>
     <string name="array_pref_auto_rotate_off">Automatska rotacija isključena</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Promjena prilagodljive razine možda neće da radi na vašem uređaju (primer: Samsung-ovi uređaji).</string>
-    <string name="about_application_xda_developers_community">XDA-developers zajednica:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Konektovana ćelija:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Konektovanje mobilne ćelije zahtijeva određene dozvole.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Broj novih ćelija:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemi:</string>
     <string name="important_info_email_body_questions">Pitanja:</string>
     <string name="important_info_email_body_suggestions">Prijedlozi:</string>
-    <string name="about_application_support">Podrška:</string>
-    <string name="about_application_support2">kontakt:</string>
     <string name="about_application_support_subject">podrška</string>
     <string name="dashclock_extension_description">Prikazuje aktivni profil sa indikatorom postavki. Otvara Aktivator na dodir.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Koristite lakoću ikona za prilagođene ikone profila</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED svijetlo obavijesti</string>
+    <string name="profile_preferences_notificationLed_23">LED svijetlo obavijesti</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Uvek uključen zaslon</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-hu/strings.xml b/common/src/main/res/values-hu/strings.xml
index ce718c2766..83ff90546b 100644
--- a/common/src/main/res/values-hu/strings.xml
+++ b/common/src/main/res/values-hu/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Szerkesztő</string>
     <string name="menu_settings">Beállítások</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profil tulajdonságai</string>
     <string name="title_activity_event_preferences">Esemény tulajdonságai</string>
     <string name="menu_new_profile">Új profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatikus forgatás be</string>
     <string name="array_pref_auto_rotate_off">Automatikus forgatás ki</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Adaptív változást nem működik az eszközön (például: Samsung eszközök).</string>
-    <string name="about_application_xda_developers_community">XDA-developers közösség:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Csatlakoztatott cella:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobil cellák regisztrációhoz néhány engedélyt meg kell adni.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Új cellák száma:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problémák:</string>
     <string name="important_info_email_body_questions">Kérdések:</string>
     <string name="important_info_email_body_suggestions">Javaslatok:</string>
-    <string name="about_application_support">Támogatás:</string>
-    <string name="about_application_support2">kapcsolat:</string>
     <string name="about_application_support_subject">támogatás</string>
     <string name="dashclock_extension_description">Megjeleníti az aktív profilt beállításait indikátorral. Aktivátor megnyitás érintésre.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Használjon a világos ikonokat az egyéni profilikonokhoz</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED értesítés</string>
+    <string name="profile_preferences_notificationLed_23">LED értesítés</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Képernyő mindig bekapcsolva</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-in/strings.xml b/common/src/main/res/values-in/strings.xml
index b66724dd7a..fef98caeb1 100644
--- a/common/src/main/res/values-in/strings.xml
+++ b/common/src/main/res/values-in/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Pengedit</string>
     <string name="menu_settings">Pengaturan</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferensi profil</string>
     <string name="title_activity_event_preferences">Acara preferensi</string>
     <string name="menu_new_profile">Profil baru</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Menampilkan profil aktif dengan indikator preferensi. Terbuka Activator pada sentuhan.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Pemberitahuan LED</string>
+    <string name="profile_preferences_notificationLed_23">Pemberitahuan LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-is/strings.xml b/common/src/main/res/values-is/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-is/strings.xml
+++ b/common/src/main/res/values-is/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 5c4ed821df..f7f48b577c 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Impostazioni</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferenze profilo</string>
     <string name="title_activity_event_preferences">Preferenze evento</string>
     <string name="menu_new_profile">Nuovo profilo</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Rotazione automatica attivata</string>
     <string name="array_pref_auto_rotate_off">Rotazione automatica disattivata</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Cambiamento del livello adattivo potrebbe non funzionare sul tuo dispositivo (esempio: dispositivi di Samsung).</string>
-    <string name="about_application_xda_developers_community">Comunità di XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Cella collegata:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">La registrazione delle cellule mobili richiede alcune autorizzazioni.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Conteggio nuove celle:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemi:</string>
     <string name="important_info_email_body_questions">Domande:</string>
     <string name="important_info_email_body_suggestions">Suggerimenti:</string>
-    <string name="about_application_support">Assistenza:</string>
-    <string name="about_application_support2">contatto:</string>
     <string name="about_application_support_subject">assistenza</string>
     <string name="dashclock_extension_description">Visualizza il profilo attivo con indicatore di preferenze. Apre attivatore al tocco.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Usa la luminosità dell\'icona per le icone del profilo personalizzate</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Led di notifica</string>
+    <string name="profile_preferences_notificationLed_23">Led di notifica</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Schermo Sempre Acceso</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Griglia compatta</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-iw/strings.xml b/common/src/main/res/values-iw/strings.xml
index 1dda53e216..fec04791a0 100644
--- a/common/src/main/res/values-iw/strings.xml
+++ b/common/src/main/res/values-iw/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">עורך</string>
     <string name="menu_settings">הגדרות</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">העדפות פרופיל</string>
     <string name="title_activity_event_preferences">העדפות אירוע</string>
     <string name="menu_new_profile">פרופיל חדש</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">הצגת הפרופיל הפעיל עם חיווי הגדרות. המפעיל ייפתח בנגיעה.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">נורית התראות (אדום)</string>
+    <string name="profile_preferences_notificationLed_23">נורית התראות</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ja/strings.xml b/common/src/main/res/values-ja/strings.xml
index e592587dc6..2515aaab45 100644
--- a/common/src/main/res/values-ja/strings.xml
+++ b/common/src/main/res/values-ja/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">エディター</string>
     <string name="menu_settings">設定</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">プロファイル設定</string>
     <string name="title_activity_event_preferences">イベント設定</string>
     <string name="menu_new_profile">新規プロファイル</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">自動回転オン</string>
     <string name="array_pref_auto_rotate_off">自動回転オフ</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">アダプティブレベルの変更は、お使いのデバイスでは動作しない可能性があります(例: Samsung デバイス)。</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">接続されたスマートフォン：</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">スマートフォンの登録にはいくつかの権限が必要です。</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">新しいスマートフォン数：</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) 通知LED</string>
+    <string name="profile_preferences_notificationLed_23">通知LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ko/strings.xml b/common/src/main/res/values-ko/strings.xml
index 480ce2cf2e..54a32c37b2 100644
--- a/common/src/main/res/values-ko/strings.xml
+++ b/common/src/main/res/values-ko/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">편집기</string>
     <string name="menu_settings">설정</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">프로필 설정</string>
     <string name="title_activity_event_preferences">이벤트 설정</string>
     <string name="menu_new_profile">새 프로필</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">활성창에서 프로필의 설정을 표시.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ku/strings.xml b/common/src/main/res/values-ku/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-ku/strings.xml
+++ b/common/src/main/res/values-ku/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-lb/strings.xml b/common/src/main/res/values-lb/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-lb/strings.xml
+++ b/common/src/main/res/values-lb/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-lv/strings.xml b/common/src/main/res/values-lv/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-lv/strings.xml
+++ b/common/src/main/res/values-lv/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ms/strings.xml b/common/src/main/res/values-ms/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-ms/strings.xml
+++ b/common/src/main/res/values-ms/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-nl/strings.xml b/common/src/main/res/values-nl/strings.xml
index 89e4535c46..3ddd8651c2 100644
--- a/common/src/main/res/values-nl/strings.xml
+++ b/common/src/main/res/values-nl/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Bewerker</string>
     <string name="menu_settings">Opties</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profiel voorkeuren</string>
     <string name="title_activity_event_preferences">Eventvoorkeuren</string>
     <string name="menu_new_profile">Nieuw profiel</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatische rotatie aan</string>
     <string name="array_pref_auto_rotate_off">Automatische rotatie uit</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Verandering van adaptieve niveau werkt mogelijk niet op uw apparaat (voorbeeld: Samsung apparaten).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Gekoppelde cel:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Zendmast cel registratie vereist een aantal machtigingen.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Aantal nieuwe zendmast cellen:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemen:</string>
     <string name="important_info_email_body_questions">Vragen:</string>
     <string name="important_info_email_body_suggestions">Suggesties:</string>
-    <string name="about_application_support">Ondersteuning:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">ondersteuning</string>
     <string name="dashclock_extension_description">Actief profiel weergeven met voorkeuraanduiding. Opent de Activator bij aanraken.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Gebruik icoon helderheid voor aangepaste profiel iconen</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is niet geïnstalleerd!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">PPPPutSettings niet geinstalleerd</string>
     <string name="about_application_pppps_source_code">Broncode - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Meldingen LED</string>
+    <string name="profile_preferences_notificationLed_23">Meldingen LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Altijd aan schermweergave</string>
     <string name="samsung_edge_panel_settings_description">Instellingen Samsung Edge-vensters</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compacte raster</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi en Bluetooth bevestigingsscherm</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Voor \"HyperOs\" is het mogelijk deze dialogen uit te schakelen. Klik hier om ze uit te schakelen. Let op: Shizuku/root is vereist.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei apparaten zit een bug. Om deze reden werken mogelijk niet alle niet-interactieve types.</string>
+    <string name="menu_check_releases_neostore">Controleren in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus versie in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Zet Locatie en \"Wi-Fi scannen\" aan bij Systeeminstellingen. Zonder dit werkt de sensor niet.</string>
+    <string name="download_installWithOptions_title">Downloaden van InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Downloaden van PPPPutSettings.apk</string>
+    <string name="downloading_file_description">Bestand wordt opgeslagen in map Downloads</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Sommige parameters zijn niet geconfigureerd!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Deze parameters moet je configureren om de event functionaliteit goed te laten werken.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Klok</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Informatie over Dash Klok</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Klik hier om informatie te tonen over Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is verouderd en staat niet in de Google Play store. Maar het is wel mogelijk om de laatste versie van APKMirror te installeren.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Snelkoppeling naar Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Snelkoppeling naar \"Zendmast cellen scannen\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Snelkoppeling naar \"NFC-tag lezen\"</string>
+    <string name="shortcut_to_dialog_lablel">Sneltoets pictogramnaam:</string>
+    <string name="shortcut_to_dialog_create_button">Maak</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cellen scannen</string>
+    <string name="read_nfc_tag_short_shortcut_name">Tag lezen</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">De meeste apparaten hebben \"ringtoonvolume\" en \"systeemvolume\" samengevoegd. Deze apparaten hebben geen optie bij de instellingen om \"systeemvolume\" te configureren. Om deze reden wordt aanbevolen het \"Volume bellen\" te configureren, wanneer het \"Systeem volume\" is geconfigureerd of het om \"Systeem volume\" niet configureren.</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Simkaart aan- of uitzetten</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WAARSCHUWING: Dit geeft het scherm voor de Pincode van de Simkaart die is ingesteld als \"Aan\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server uitnodiging</string>
 </resources>
diff --git a/common/src/main/res/values-no/strings.xml b/common/src/main/res/values-no/strings.xml
index 56fc4bcfec..5bf2d21370 100644
--- a/common/src/main/res/values-no/strings.xml
+++ b/common/src/main/res/values-no/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-pl/strings.xml b/common/src/main/res/values-pl/strings.xml
index 71622fedbb..e3cb60a108 100644
--- a/common/src/main/res/values-pl/strings.xml
+++ b/common/src/main/res/values-pl/strings.xml
@@ -3,8 +3,7 @@
 <!--suppress XmlUnusedNamespaceDeclaration -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Redaktor</string>
-    <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
+    <string name="menu_settings">Ustawienia</string>
     <string name="title_activity_profile_preferences">Ustawienia profilu</string>
     <string name="title_activity_event_preferences">Ustawienia zdarzeń</string>
     <string name="menu_new_profile">Nowy profil</string>
@@ -264,7 +263,7 @@
     <string name="event_name_background_profile">Profil domyślny</string>
     <string name="array_pref_zenModeArray_priority">Priorytet</string>
     <string name="preference_profile_adaptiveBrightness">Adaptacyjna</string>
-    <string name="profile_preferences_deviceKeyguard">Unlock device</string>
+    <string name="profile_preferences_deviceKeyguard">Odblokuj urządzenie</string>
     <string name="phone_profiles_pref_applicationWidgetIconHideProfileName">Ukryj nazwę profilu</string>
     <string name="array_pref_afterProfileDurationDo_restartEvents">Zrestartuj zdarzenia</string>
     <string name="array_event_pref_wifiConnectionType_notConnected">Nie połączono</string>
@@ -406,7 +405,7 @@
     <string name="event_preferences_category_eventApplicationsParameters">Czujnik aplikacji</string>
     <string name="event_preferences_applications_applications">Aplikacje</string>
     <string name="important_info_profile_activation_text1">Profile mogą zostać aktywowane w jednym z dwóch trybów:</string>
-    <string name="important_info_profile_activation_text2">Ręczna aktywacja - aktywowany w Aktywatorze, Edytorze, powiadomieniu, widgecie, skrócie. Ręcznie aktywowane profile są zaznaczane symbolem \"[M]\" przed nazwą profilu.</string>
+    <string name="important_info_profile_activation_text2">Ręczna aktywacja - aktywowany w Aktywatorze, Edytorze, powiadomieniu, widżecie, skrócie. Ręcznie aktywowane profile są zaznaczane symbolem \"[M]\" przed nazwą profilu.</string>
     <string name="important_info_profile_activation_text3">Aktywacja zdarzenia - aktywowano przez zdarzenie.</string>
     <string name="important_info_profile_activation_text4">Ręczna aktywacja wstrzymuje wszystkie zdarzenia, które nigdy nie zostaną uruchomione. Musisz ręcznie Zrestartować zdarzenia, aby wznowić normalne funkcje zdarzenia.</string>
     <string name="important_info_profile_activation_text5">Wyjątek od tej reguły stosuje się po ustawieniu preferencji \"Ignoruj ręczną aktywację\".</string>
@@ -473,7 +472,7 @@
     <string name="array_pref_color_white">Biały</string>
     <string name="array_pref_color_black">Czarny</string>
     <string name="profile_preferences_notificationLed">Dioda powiadomień</string>
-    <string name="profile_preferences_notificationLedInfo_summary">Eksperymentalne. Może nie działać na Twoim urządzeniu</string>
+    <string name="profile_preferences_notificationLedInfo_summary">Eksperymentalne. Może nie działać na Twoim urządzeniu.</string>
     <string name="event_type_orientation">Orientacja</string>
     <string name="event_preferences_category_eventOrientationParameters">Czujnik orientacji</string>
     <string name="event_preferences_orientation_display">Wyświetlacz</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatyczny obrót ekranu włączony</string>
     <string name="array_pref_auto_rotate_off">Automatyczny obrót ekranu wyłączony</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Zmiana poziomu automatycznego może nie działać na Twoim urządzeniu (np. w Samsungach).</string>
-    <string name="about_application_xda_developers_community">Forum XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Połączona stacja:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Rejestracja stacji bazowych wymaga kilku uprawnień.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Liczba nowych stacji:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemy:</string>
     <string name="important_info_email_body_questions">Pytania:</string>
     <string name="important_info_email_body_suggestions">Sugestie:</string>
-    <string name="about_application_support">Wsparcie:</string>
-    <string name="about_application_support2">kontakt:</string>
     <string name="about_application_support_subject">wsparcie</string>
     <string name="dashclock_extension_description">Wyświetla aktywny profil z ikonką preferencji. Otwiera Aktywator po dotknięciu.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Użyj jasności ikony dla ikon niestandardowych</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings nie jest zainstalowany!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">nie zainstalowano PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Kod źródłowy - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Dioda powiadomień</string>
+    <string name="profile_preferences_notificationLed_23">Dioda powiadomień</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) wyświetlacz Always-On</string>
     <string name="samsung_edge_panel_settings_description">Ustawienia panelu bocznego Samsung</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Siatka kompaktowa</string>
@@ -2143,48 +2139,76 @@
     <string name="nfc_tag_pref_dlg_writeToNfcTag_writeNameToTagAndAddNameButton">Nazwij tag</string>
     <string name="nfc_tag_pref_dlg_writeToNfcTag_touch1">Zbliż urządzenie do tagu NFC. Wtedy kliknij przycisk</string>
     <string name="nfc_tag_pref_dlg_writeToNfcTag_touch2">Zapis zostanie uruchomiony.</string>
-    <string name="event_preferences_applications_duration">Applications run duration</string>
-    <string name="event_preferences_applications_duration_unlimited">Unlimited</string>
-    <string name="profile_preferences_category_phone_calls">Phone calls</string>
-    <string name="profile_preferences_phoneCalls_setCallScreeningRole">Set call screening role</string>
-    <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary">Click here to set call screening role for PhoneProfilesPlus. Is required for \"Block phone calls\".</string>
-    <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary_ststus_1">Call screening role for PhoneProfilesPlus is set</string>
-    <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary_ststus_0">Call screening role for PhoneProfilesPlus is not set</string>
-    <string name="profile_preference_phoneCallsBlockCalls">Block phone calls</string>
-    <string name="profile_preference_phoneCallsBlockCalls_summary">WARNING: This parameter allows block calls, configured in \"Contact groups\", \"Contacts\". Notification about blocked calls will not be displayed!</string>
-    <string name="profile_preference_phoneCallsContactGroups">Contact groups</string>
-    <string name="profile_preference_phoneCallsContacts">Contacts</string>
-    <string name="permission_why_profile_phone_calls">for read contacts in profile parameter \"Phone calls\"</string>
-    <string name="export_settings_delete_contacts_data_phonecalls">Contacts for profile parameter \"Phone calls\"</string>
-    <string name="profile_preference_phoneCallsSendSMS">Send SMS</string>
-    <string name="profile_preference_phoneCallsSMSText">SMS Text</string>
-    <string name="profile_preference_phoneCalls_sendSMS_sumary">WARNING: Sending SMS may be charged or used from a prepaid SMS package!</string>
-    <string name="notification_channel_notify_event_start_description_2">Is displayed, when event has enabled \"Start of event\"/\"Other parameters\"/\"Repeat notification\".</string>
-    <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
-    <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
-    <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
-    <string name="no_error_dialog_message">The error has already been fixed.</string>
-    <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
-    <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
-    <string name="application_editor_intent_test_broadcast_working_good">Broadcast working good</string>
-    <string name="event_preference_sensor_music_summary">This sensor will start an event if music is playing. Parameters: Music state.</string>
-    <string name="event_type_music">Music</string>
-    <string name="event_preferences_category_eventMusicParameters">Music sensor</string>
-    <string name="event_preferences_music_state">Music state</string>
-    <string name="array_event_pref_music_state_playing">Music is playing</string>
-    <string name="array_event_pref_music_state_not_playing">Music is not playing</string>
-    <string name="install_pppps_text10">For Android 14+ is not normally possible to install PPPPutSettings directly on the device.</string>
-    <string name="install_pppps_text11">But exists solution. This requires InstallWithOptions and Shizuku (if device is not rooted).</string>
-    <string name="install_pppps_text12">How to proceed:</string>
-    <string name="install_pppps_text13">1. Install and start Shizuku (if device is not rooted). How, is in:</string>
-    <string name="install_pppps_text14">2. Install InstallWithOptions:</string>
-    <string name="install_pppps_text15">3. Download PPPPutSettings:</string>
-    <string name="install_pppps_text16">4. In InstallWithOptions enable: \"Bypass Low Target SDK Block\", \"Replace existing\".</string>
-    <string name="install_pppps_text17">5. In InstallWithOptions use \"Choose file\" button, file: downloaded PPPPutSettings.apk.</string>
-    <string name="install_pppps_text18">6. In InstallWithOptions use \"Install\" button.</string>
-    <string name="profile_preferences_deviceImageWallpaperLockscreen">Image wallpaper for lock screen</string>
-    <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
-    <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
-    <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="event_preferences_applications_duration">Długość czasu pracy aplikacji</string>
+    <string name="event_preferences_applications_duration_unlimited">Nieograniczona</string>
+    <string name="profile_preferences_category_phone_calls">Połączenia telefoniczne</string>
+    <string name="profile_preferences_phoneCalls_setCallScreeningRole">Ustaw rolę filtra połączeń</string>
+    <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary">Kliknij tutaj, aby ustawić rolę filtra połączeń dla PhoneProfilesPlus. Jest to wymagane dla \"Blokuj połączenia telefoniczne\".</string>
+    <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary_ststus_1">Ustawiono funkcję filtra połączeń dla PhoneProfilesPlus</string>
+    <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary_ststus_0">Funkcja filtra połączeń dla PhoneProfilesPlus wyłączona</string>
+    <string name="profile_preference_phoneCallsBlockCalls">Zablokuj połączenia telefoniczne</string>
+    <string name="profile_preference_phoneCallsBlockCalls_summary">OSTRZEŻENIE: Ten parametr umożliwia blokowanie połączeń, skonfigurowanych w \"kontaktach\", \"grupach kontaktów\". Powiadomienie o zablokowanych połączeniach nie będzie wyświetlane!</string>
+    <string name="profile_preference_phoneCallsContactGroups">Grupy kontaktów</string>
+    <string name="profile_preference_phoneCallsContacts">Kontakty</string>
+    <string name="permission_why_profile_phone_calls">dla odczytu kontaktów w parametrze profilu \"Połączenia telefoniczne\"</string>
+    <string name="export_settings_delete_contacts_data_phonecalls">Kontakty dla parametru profilu \"Połączenia telefoniczne\"</string>
+    <string name="profile_preference_phoneCallsSendSMS">Wyślij SMS</string>
+    <string name="profile_preference_phoneCallsSMSText">Tekst SMS</string>
+    <string name="profile_preference_phoneCalls_sendSMS_sumary">OSTRZEŻENIE: Wysyłanie wiadomości SMS może być obciążone opłatą lub użyje przedpłacony pakiet SMS!</string>
+    <string name="notification_channel_notify_event_start_description_2">Jest wyświetlane, gdy zdarzenie włączyło \"Początek zdarzenia\"/\"Inne parametry\"/\"Powtórz powiadomienie\".</string>
+    <string name="notification_channel_generated_by_profile_description_2">Jest wyświetlany, gdy profil skonfigurowano \"Inne\"/\"Wygeneruj powiadomienie\".</string>
+    <string name="notification_channel_profile_list_description_2">Wyświetla się, gdy jest włączone \"Ustawienia\"/\"Powiadomienie listy profili\"/\"Wyświetlaj powiadomienie\"</string>
+    <string name="do_not_disturb_access_permission_notification">Dostęp do „Nie przeszkadzać”</string>
+    <string name="do_not_disturb_access_permission_notification_text">Aby wyświetlić ważne powiadomienia PhoneProfilesPlus, zezwól PhoneProfilesPlus na dostęp do \"Nie przeszkadzać\" w ustawieniach systemowych. Kliknij tutaj, aby to włączyć.</string>
+    <string name="no_error_dialog_message">Błąd został już naprawiony.</string>
+    <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" musi być skonfigurowany.</string>
+    <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Nazwa pakietu\" musi być skonfigurowana dla typu intencji \"Broadcast\" z niestandardowym \"Action\".</string>
+    <string name="application_editor_intent_test_broadcast_working_good">Broadcast działa dobrze</string>
+    <string name="event_preference_sensor_music_summary">Ten czujnik uruchomi zdarzenie, jeśli muzyka jest odtwarzana. Parametry: Stan muzyki.</string>
+    <string name="event_type_music">Muzyka</string>
+    <string name="event_preferences_category_eventMusicParameters">Czujnik muzyki</string>
+    <string name="event_preferences_music_state">Stan muzyki</string>
+    <string name="array_event_pref_music_state_playing">Muzyka jest odtwarzana</string>
+    <string name="array_event_pref_music_state_not_playing">Muzyka nie jest odtwarzana</string>
+    <string name="install_pppps_text10">Dla Androida 14+ zazwyczaj nie jest możliwa bezpośrednia instalacja PPPPutSettings na urządzeniu.</string>
+    <string name="install_pppps_text11">Ale istnieje rozwiązanie. Wymaga to instalacji InstallWithOptions i Shizuku (jeśli urządzenie nie jest zrootowane).</string>
+    <string name="install_pppps_text12">Procedura postępowania:</string>
+    <string name="install_pppps_text13">1. Zainstaluj i uruchom Shizuku (jeśli urządzenie nie jest zrootowane). Jak to zrobić:</string>
+    <string name="install_pppps_text14">2. Zainstaluj InstallWithOptions:</string>
+    <string name="install_pppps_text15">3. Pobierz PPPPutsettings:</string>
+    <string name="install_pppps_text16">4. W InstallWithOptions włącz: \"Bypass Low Target SDK Block\", \"Replace existing\".</string>
+    <string name="install_pppps_text17">5. W InstallWithOptions użyj przycisku \"Choose file\", plik: pobrany PPPPutSettings.apk.</string>
+    <string name="install_pppps_text18">6. W InstallWithOptions użyj przycisku \"Install\".</string>
+    <string name="profile_preferences_deviceImageWallpaperLockscreen">Tapeta ekranu blokady</string>
+    <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) okna potwierdzenia Wi-Fi i Bluetooth</string>
+    <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Dla \"HyperOs\" możliwe jest wyłączenie tych okien dialogowych. Kliknij tutaj, aby je wyłączyć. UWAGA: Wymaga to Shizuku/root.</string>
+    <string name="profile_preferences_deviceWallpaperHuaweiInfo">W urządzeniach Huawei jest błąd. I z tego powodu mogą nie działać poprawnie wszystkie nieinteraktywne typy.</string>
+    <string name="menu_check_releases_neostore">Sprawdź w Neo Store</string>
+    <string name="check_releases_open_neostore">Otwórz Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">Wersja PhoneProfilesPlus w Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Proszę włączyć lokalizację i \"skanowanie Wi-Fi\" w Ustawieniach Systemowych. Bez tego czujnik nie będzie działał.</string>
+    <string name="download_installWithOptions_title">Pobierz InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Pobierz PPPPutsettings.apk</string>
+    <string name="downloading_file_description">Plik zostanie zapisany w katalogu Pobrane</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Niektóre parametry nie są skonfigurowane!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Te parametry muszą być skonfigurowane dla odpowiedniej funkcjonalności zdarzenia.</string>
+    <string name="downloading_toast_text">Pobieranie…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info o Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Kliknij tutaj, aby wyświetlić informacje o widżecie Dash Clock.</string>
+    <string name="dash_clock_widget_info_1">Widżet Dash Clock jest przestarzały i nie jest dostępny w Google Play, ale możliwe jest zainstalowanie najnowszej wersji z APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget na Githubie:</string>
+    <string name="dash_clock_widget_info_3">Pobieranie z APKMirror:</string>
+    <string name="shortcut_to_editor_dialog_title">Skrót do Edytora</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Skrót do \"skanowania stacji bazowych\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Skrót do \"Odczytaj tag NFC\"</string>
+    <string name="shortcut_to_dialog_lablel">Nazwa ikony skrótu:</string>
+    <string name="shortcut_to_dialog_create_button">Utwórz</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Skanowanie komórek</string>
+    <string name="read_nfc_tag_short_shortcut_name">Czytaj tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Większość urządzeń ma połączone \"głośność dzwonka\" i \"głośność systemu\". Te urządzenia nie mają opcji konfiguracji \"głośność systemu\" w ustawieniach urządzenia. Z tego powodu zalecane jest skonfigurowanie \"głośności dzwonka\", gdy jest skonfigurowana \"głośność systemowa\" lub nie konfigurować \"głośności systemu\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Włącz/wyłącz kartę SIM</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">OSTRZEŻENIE: To wyświetli ekran wprowadzania kodu PIN dla karty SIM, która jest skonfigurowana jako \"Włączona\".</string>
+    <string name="menu_discord_server">Serwer PhoneProfilesPlus</string>
+    <string name="menu_discord_invitation">Zaproszenie do serwera PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-pt-rBR/strings.xml b/common/src/main/res/values-pt-rBR/strings.xml
index 7457397f6f..ecd6a42fd8 100644
--- a/common/src/main/res/values-pt-rBR/strings.xml
+++ b/common/src/main/res/values-pt-rBR/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Definições</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferências do Perfil</string>
     <string name="title_activity_event_preferences">Preferências do Evento</string>
     <string name="menu_new_profile">Novo perfil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Mostra o perfil ativo com o indicador de preferência. Abre o ativador ao tocar.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notificação por LED</string>
+    <string name="profile_preferences_notificationLed_23">Notificação por LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-pt-rPT/strings.xml b/common/src/main/res/values-pt-rPT/strings.xml
index 2b79fe53db..905b959e14 100644
--- a/common/src/main/res/values-pt-rPT/strings.xml
+++ b/common/src/main/res/values-pt-rPT/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Definições</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferências do Perfil</string>
     <string name="title_activity_event_preferences">Opçoes de evento</string>
     <string name="menu_new_profile">Novo perfil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Mostra o perfil ativo com o indicador de preferência. Abre o ativador ao tocar.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ro/strings.xml b/common/src/main/res/values-ro/strings.xml
index d32f78f8f1..3a669bf59e 100644
--- a/common/src/main/res/values-ro/strings.xml
+++ b/common/src/main/res/values-ro/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Setări</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Preferințe profil</string>
     <string name="title_activity_event_preferences">Preferințe eveniment</string>
     <string name="menu_new_profile">Profil nou</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Afiseaza profilul activ cu indicator de preferinţe. Deschide Activator pe touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml
index 50c120755b..82854b5043 100644
--- a/common/src/main/res/values-ru/strings.xml
+++ b/common/src/main/res/values-ru/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Редактор</string>
     <string name="menu_settings">Настройки</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Настройки профиля</string>
     <string name="title_activity_event_preferences">Настройки события</string>
     <string name="menu_new_profile">Новый профиль</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Автоповорот вкл.</string>
     <string name="array_pref_auto_rotate_off">Автоповорот выкл.</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Адаптивное изменение яркости может не работать на вашем устройстве (например, на устройствах Samsung).</string>
-    <string name="about_application_xda_developers_community">Сообщество XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Подключённая вышка:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Регистрация мобильных вышек требует некоторых разрешений.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Новых вышек:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Проблемы:</string>
     <string name="important_info_email_body_questions">Вопросы:</string>
     <string name="important_info_email_body_suggestions">Предложения:</string>
-    <string name="about_application_support">Поддержка:</string>
-    <string name="about_application_support2">пишите:</string>
     <string name="about_application_support_subject">поддержка</string>
     <string name="dashclock_extension_description">Отображает активный профиль с индикатором настроек. Открывает Активатор по прикосновению.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Использовать яркость иконки для пользовательских иконок профиля</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings не установлено!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">PPPPutSettings не установлено</string>
     <string name="about_application_pppps_source_code">Исходный код - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED-уведомление</string>
+    <string name="profile_preferences_notificationLed_23">LED-уведомление</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Настройки панели Samsung Edge</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Компактная сетка</string>
@@ -2128,7 +2124,7 @@
     <string name="profile_preferences_deviceNetworkTypeSIM2">(Z)(R) Тип мобильной сети для SIM 2</string>
     <string name="profile_preferences_deviceDefaultSIM">(Z)(R) SIM-карта по умолчанию</string>
     <string name="nfc_tag_pref_dlg_readNfcTag_title">Считать NFC-метку</string>
-    <string name="nfc_tag_pref_dlg_readNfcTag_text">Считывание NFC-метки, записанной в PhonePorfilesPlus.</string>
+    <string name="nfc_tag_pref_dlg_readNfcTag_text">Считывание NFC-метки, записанной в PhoneProfilesPlus.</string>
     <string name="event_preferences_nfc_createReadNFCTagShortcut">Ярлык для \"Считывания NFC-метки\"</string>
     <string name="event_preferences_nfc_createReadNFCTagShortcut_summary">Нажмите сюда, чтобы создать на домашнем экране ярлык для \"Считывания NFC-метки\".</string>
     <string name="event_preferences_nfc_createReadNFCTagShortcut_summary_info">Если при попытке считать NFC-метку ваше устройство показывает уведомление об отсутствии на переднем плане приложения для считывания NFC-меток (как, например, некоторые устройства Xiaomi), создайте этот ярлык и пользуйтесь им каждый раз, когда вы хотите считать NFC-метку, чтобы инициировать событие в PPP.</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Диалоги подтверждения Wi-Fi и Bluetooth</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">На HyperOs эти диалоги можно отключить. Для этого нажмите сюда. ПРИМЕЧАНИЕ: Требуется Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">На устройствах Huawei существует баг, из-за которого все неинтерактивные типы могут работать неправильно.</string>
+    <string name="menu_check_releases_neostore">Проверить в Neo Store</string>
+    <string name="check_releases_open_neostore">Открыть Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus в Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Включите, пожалуйста, определение местоположения и сканирование Wi-Fi в настройках системы. Без этого датчик работать не будет.</string>
+    <string name="download_installWithOptions_title">Загрузка InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Загрузка PPPPutSettings.apk</string>
+    <string name="downloading_file_description">Файл будет сохранён в папку Downloads</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Некоторые параметры не заданы!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Для правильной работы события эти параметры должны быть заданы.</string>
+    <string name="downloading_toast_text">Загрузка…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Виджет: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Информация о Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Нажмите сюда, чтобы посмотреть информацию о Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget устарел и отсутствует в Google Play, но его последнюю версию можно установить с APKMirror.</string>
+    <string name="dash_clock_widget_info_2">GitHub Dash Clock Widget:</string>
+    <string name="dash_clock_widget_info_3">Загрузить с APKMirror:</string>
+    <string name="shortcut_to_editor_dialog_title">Ярлык для Редактора</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Ярлык для \"Сканирования мобильных вышек\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Ярлык для \"Считывания NFC-метки\"</string>
+    <string name="shortcut_to_dialog_lablel">Название ярлыка:</string>
+    <string name="shortcut_to_dialog_create_button">Создать</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Сканирование вышек</string>
+    <string name="read_nfc_tag_short_shortcut_name">Считать метку</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">В большинстве устройств \"Громкость звонка\" объединена с \"Громкостью системных звуков\". В системных настройках таких устройств нет возможности отдельно установить только громкость системных звуков. Из-за этого рекомендуется или вовсе не устанавливать \"Громкость системных звуков\", или установить ещё и \"Громкость звонка\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Вкл./выкл. SIM</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">ВНИМАНИЕ: Это действие вызовет экран ввода PIN-кода для включаемой SIM-карты.</string>
+    <string name="menu_discord_server">Сервер PhoneProfilesPlus</string>
+    <string name="menu_discord_invitation">Приглашение на сервер PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-sk/strings.xml b/common/src/main/res/values-sk/strings.xml
index 207d4b4217..9e18f88f6f 100644
--- a/common/src/main/res/values-sk/strings.xml
+++ b/common/src/main/res/values-sk/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Nastavenia</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Parametre profilu</string>
     <string name="title_activity_event_preferences">Parametre udalosti</string>
     <string name="menu_new_profile">Nový profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Zapnúť automatickú orientáciu</string>
     <string name="array_pref_auto_rotate_off">Vypnúť automatickú orientáciu</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Zmena úrovne adaptívneho jasu nemusí fungovať na vašom zariadení (napríklad: zariadenia Samsung).</string>
-    <string name="about_application_xda_developers_community">Komunita XDA-developers:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Pripojená bunka:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Registrácia mobilných buniek vyžaduje nejaké povolenia.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Počet nových buniek:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problémy:</string>
     <string name="important_info_email_body_questions">Otázky:</string>
     <string name="important_info_email_body_suggestions">Návrhy:</string>
-    <string name="about_application_support">Podpora:</string>
-    <string name="about_application_support2">kontakt:</string>
     <string name="about_application_support_subject">podpora</string>
     <string name="dashclock_extension_description">Zobrazí aktívny profil s indikátorom preferencií profilu. Na kliknutie sa otvorí Aktivátor.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Použiť svetlosť ikony pre vlastné ikony</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings nie je nainštalovaný!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">nie je nainštalované PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Zdrojový kód - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notifikačná dióda</string>
+    <string name="profile_preferences_notificationLed_23">Notifikačná dióda</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-on displej</string>
     <string name="samsung_edge_panel_settings_description">Nastavenia pre Samsung bočný panel</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Kompaktná mriežka</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi a Bluetooth potvrdzovací dialóg</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Pre \"HyperOs\" je možné tieto dialógy vypnúť. Kliknutím na toto ich zakážete. POZNÁMKA: Vyžaduje Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">V zariadeniach Huawei je chyba. A z tohto dôvodu nemusia správne fungovať všetky neinteraktívne typy.</string>
+    <string name="menu_check_releases_neostore">Skontrolovať v Neo Store</string>
+    <string name="check_releases_open_neostore">Otvoriť Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">Vydanie PhoneProfilesPlus v Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Prosím zapnite Polohu a \"Vyhľadávanie cez Wi-Fi\" v nastaveniach systému. Bez toho senzor nebude fungovať.</string>
+    <string name="download_installWithOptions_title">Sťahovanie InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Sťahovanie PPPPutSettings.apk</string>
+    <string name="downloading_file_description">Súbor bude uložený do adresára Downloads</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Niektoré parametre nie sú nakonfigurované!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Tieto parametre musia byť nakonfigurované pre správnu funkčnosť udalosti.</string>
+    <string name="downloading_toast_text">Sťahuje sa…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Miniaplikácia: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Informácie o Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Kliknutím sem zobrazíte informácie o Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget je zastaraný a nie je v Google Play, ale je možné nainštalovať najnovšiu verziu z APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">Stiahnutie z APKMirror:</string>
+    <string name="shortcut_to_editor_dialog_title">Odkaz na Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Odkaz na \"Skenovanie mobilných buniek\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Odkaz na \"Čítať NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Názov ikony odkazu:</string>
+    <string name="shortcut_to_dialog_create_button">Vytvoriť</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Sken buniek</string>
+    <string name="read_nfc_tag_short_shortcut_name">Čitať tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Väčšina zariadení má zlúčené \"Hlasitosť zvonenia\" a \"Hlasitosť systému\". Tieto zariadenia nemajú v Nastaveniach zariadenia možnosť konfigurovať \"Hlasitosť systému\". Z tohto dôvodu sa odporúča nakonfigurovať \"Hlasitosť zvonenia\", keď je nakonfigurovaná \"Hlasitosť systému\" alebo nekonfigurovať \"Hlasitosť systému\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Zapnutie/vypnutie SIM</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">UPOZORNENIE: Zobrazí sa obrazovka na zadanie kódu PIN pre kartu SIM, ktorá je nakonfigurovaná ako \"Zapnúť\".</string>
+    <string name="menu_discord_server">Server PhoneProfilesPlus</string>
+    <string name="menu_discord_invitation">Pozvánka na server PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-sl/strings.xml b/common/src/main/res/values-sl/strings.xml
index 0d00881372..e189918c9f 100644
--- a/common/src/main/res/values-sl/strings.xml
+++ b/common/src/main/res/values-sl/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Urejevalnik</string>
     <string name="menu_settings">Nastavitve</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Nastavitve profila</string>
     <string name="title_activity_event_preferences">Nastavitve dogodka</string>
     <string name="menu_new_profile">Nov profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Prikaže aktivni profil z indikatorjem nastavitve. Odpre Aktivator na dotik.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-sr/strings.xml b/common/src/main/res/values-sr/strings.xml
index aa78da8bae..c66bd9ee0e 100644
--- a/common/src/main/res/values-sr/strings.xml
+++ b/common/src/main/res/values-sr/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Едитор</string>
     <string name="menu_settings">Подешавања</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Подешавање профила</string>
     <string name="title_activity_event_preferences">Подешавање догађаја</string>
     <string name="menu_new_profile">Нови профил</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED нотификација</string>
+    <string name="profile_preferences_notificationLed_23">LED нотификација</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-sv/strings.xml b/common/src/main/res/values-sv/strings.xml
index 79a2ad4c10..7aae96aa83 100644
--- a/common/src/main/res/values-sv/strings.xml
+++ b/common/src/main/res/values-sv/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Redigerare</string>
     <string name="menu_settings">Inställningar</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profilegenskaper</string>
     <string name="title_activity_event_preferences">Händelseegenskaper</string>
     <string name="menu_new_profile">Ny profil</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Visar aktiva profilen med inställningsindikator. Öppnar Väljare på beröring.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-te/strings.xml b/common/src/main/res/values-te/strings.xml
index 30fed80e7c..941b4075dc 100644
--- a/common/src/main/res/values-te/strings.xml
+++ b/common/src/main/res/values-te/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">ఎడిటర్</string>
     <string name="menu_settings">సెట్టింగులు</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">ప్రొఫైల్ ప్రాధన్యతులు</string>
     <string name="title_activity_event_preferences">ఈవెంట్ ప్రాధన్యతులు</string>
     <string name="menu_new_profile">కొత్త ప్రొఫైల్</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">ప్రాధాన్యతలను సూచిక చురుకుగా ప్రొఫైల్ ప్రదర్శిస్తుంది. టచ్ లో ఉత్తేజితం తెరుచుకుంటుంది.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-th/strings.xml b/common/src/main/res/values-th/strings.xml
index a9b9857100..b5d0583b9a 100644
--- a/common/src/main/res/values-th/strings.xml
+++ b/common/src/main/res/values-th/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">การแก้ไข</string>
     <string name="menu_settings">การตั้งค่า</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">การตั้งค่าโปรไฟล์</string>
     <string name="title_activity_event_preferences">กำหนดลักษณะเหตุการณ์</string>
     <string name="menu_new_profile">โปรไฟล์ใหม่</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
index a8d96670fc..4a4a29a6b6 100644
--- a/common/src/main/res/values-tr/strings.xml
+++ b/common/src/main/res/values-tr/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Düzenleyici</string>
     <string name="menu_settings">Ayarlar</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Tercih ayarları</string>
     <string name="title_activity_event_preferences">Durum ayarları</string>
     <string name="menu_new_profile">Yeni Tercih</string>
@@ -264,7 +263,7 @@
     <string name="event_name_background_profile">Varsayılan Tercih</string>
     <string name="array_pref_zenModeArray_priority">Öncelik</string>
     <string name="preference_profile_adaptiveBrightness">Ortama göre</string>
-    <string name="profile_preferences_deviceKeyguard">Unlock device</string>
+    <string name="profile_preferences_deviceKeyguard">Cihazın kilidini aç</string>
     <string name="phone_profiles_pref_applicationWidgetIconHideProfileName">Tercih ismini gizle</string>
     <string name="array_pref_afterProfileDurationDo_restartEvents">Durumları tekrar başlat</string>
     <string name="array_event_pref_wifiConnectionType_notConnected">Wi-Fi bağlanmadı</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Otomatik ekran döndürme açık</string>
     <string name="array_pref_auto_rotate_off">Otomatik ekran döndürme kapalı</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Uyarlanabilir seviyenin değişikliği sizin cihazinızda çalışmayabilir (misalen: Samsung cihazlar).</string>
-    <string name="about_application_xda_developers_community">XDA geliştirici topluluğu:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Bağlanılan şebeke hücresi:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Şebeke hücrelerini taramak için bazı izinler lazımdır.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Yeni şebeke hücresi sayacı:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problemler:</string>
     <string name="important_info_email_body_questions">Sorular:</string>
     <string name="important_info_email_body_suggestions">Tavsiyeler:</string>
-    <string name="about_application_support">Destek:</string>
-    <string name="about_application_support2">irtibat:</string>
     <string name="about_application_support_subject">destek</string>
     <string name="dashclock_extension_description">Başlatılmış Tercihi ayarlar göstergesinde gösterir. Dokununca \"Muharrik\" açılır.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Hususi Tercih simgesi için simge rengi açıklığını kullan</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPAyarlarıYap kurulmadı!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">PPPAyarlarıYap\'ı kurulmadı</string>
     <string name="about_application_pppps_source_code">Kaynak kod - PPPAyarlarıYap:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Bildirim ışığı</string>
+    <string name="profile_preferences_notificationLed_23">Bildirim ışığı</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Ekran Her Zaman Açık</string>
     <string name="samsung_edge_panel_settings_description">Samsung kenar paneli ayarları</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Küçük ızgara</string>
@@ -2156,14 +2152,14 @@
     <string name="profile_preference_phoneCallsContacts">Contacts</string>
     <string name="permission_why_profile_phone_calls">for read contacts in profile parameter \"Phone calls\"</string>
     <string name="export_settings_delete_contacts_data_phonecalls">Contacts for profile parameter \"Phone calls\"</string>
-    <string name="profile_preference_phoneCallsSendSMS">Send SMS</string>
+    <string name="profile_preference_phoneCallsSendSMS">SMS Gönder</string>
     <string name="profile_preference_phoneCallsSMSText">SMS Text</string>
     <string name="profile_preference_phoneCalls_sendSMS_sumary">WARNING: Sending SMS may be charged or used from a prepaid SMS package!</string>
     <string name="notification_channel_notify_event_start_description_2">Is displayed, when event has enabled \"Start of event\"/\"Other parameters\"/\"Repeat notification\".</string>
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-uk/strings.xml b/common/src/main/res/values-uk/strings.xml
index 793a4af45e..e0cbf80471 100644
--- a/common/src/main/res/values-uk/strings.xml
+++ b/common/src/main/res/values-uk/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Редактор</string>
     <string name="menu_settings">Налаштування</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Налаштування профілю</string>
     <string name="title_activity_event_preferences">Налаштування події</string>
     <string name="menu_new_profile">Новий профіль</string>
@@ -264,7 +263,7 @@
     <string name="event_name_background_profile">Стандартно налаштований профіль</string>
     <string name="array_pref_zenModeArray_priority">Важливі</string>
     <string name="preference_profile_adaptiveBrightness">Адаптивна</string>
-    <string name="profile_preferences_deviceKeyguard">Unlock device</string>
+    <string name="profile_preferences_deviceKeyguard">Розблокувати пристрій</string>
     <string name="phone_profiles_pref_applicationWidgetIconHideProfileName">Приховати назву профілю</string>
     <string name="array_pref_afterProfileDurationDo_restartEvents">Перезапустити події</string>
     <string name="array_event_pref_wifiConnectionType_notConnected">Не під’єднано</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Автоматичне обертання увімкнуто</string>
     <string name="array_pref_auto_rotate_off">Автоматичне обертання вимкнуто</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Зміна адаптивного рівня може не працювати на Вашому пристрої (наприклад: пристрої Samsung).</string>
-    <string name="about_application_xda_developers_community">XDA-developers спільнота:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Під’єднані вежі:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Реєстрація стільникових веж потребує дозволів.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">Кількість нових веж:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Проблеми:</string>
     <string name="important_info_email_body_questions">Запитання:</string>
     <string name="important_info_email_body_suggestions">Пропозиції:</string>
-    <string name="about_application_support">Підтримка:</string>
-    <string name="about_application_support2">звʼязок:</string>
     <string name="about_application_support_subject">підтримка</string>
     <string name="dashclock_extension_description">Показує активний профіль з індикатором налаштувань. Відкриває Активатор при торканні.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Використовуйте світлість іконки для іконок профілю користувача</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings не встановлено!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">не встановлено PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Початковий код - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED Сповіщення</string>
+    <string name="profile_preferences_notificationLed_23">LED Сповіщення</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Завжди на екрані</string>
     <string name="samsung_edge_panel_settings_description">Налаштування панелі Samsung edge</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Компактна сітка</string>
@@ -2183,8 +2179,36 @@
     <string name="install_pppps_text16">4. В InstallWithOptions позначте: \"Bypass Low Target SDK Block\", \"Replace existing\".</string>
     <string name="install_pppps_text17">5. В InstallWithOptions натисніть \"Виберіть файл\" та оберіть завантажений PPPPutSettings.apk.</string>
     <string name="install_pppps_text18">6. В InstallWithOptions натисніть \"Встановити\".</string>
-    <string name="profile_preferences_deviceImageWallpaperLockscreen">Image wallpaper for lock screen</string>
+    <string name="profile_preferences_deviceImageWallpaperLockscreen">Шпалери екрану блокування</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Діалоги підтвердження Wi-Fi та Bluetooth</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">Для \"HyperOS\" можливо вимкнути ці діалоги. Натисніть тут, щоб вимкнути їх. ПРИМІТКА: Потрібне Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">Huawei пристрої мають помилку і тому можуть працювати неналежним чином всі неінтерактивні типи.</string>
+    <string name="menu_check_releases_neostore">Перевірити в Neo Store</string>
+    <string name="check_releases_open_neostore">Відкрити Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus в Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Будь ласка, увімкніть Місцеперебування і сканування Wi-Fi в Налаштуваннях пристрою. Без цього датчик не працюватиме.</string>
+    <string name="download_installWithOptions_title">Завантажити InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Завантаження PPPPutSettings.apk</string>
+    <string name="downloading_file_description">Файл буде збережено в теці Завантаження</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Деякі параметри не налаштовано!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">Ці параметри мають бути налаштовані обов\'язково для належного функціонування подій.</string>
+    <string name="downloading_toast_text">Завантажується…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Віджет: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Інформація про Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Натисніть тут щоб побачити інформацію про віджет Dash Clock.</string>
+    <string name="dash_clock_widget_info_1">Віджет Dash є застарілим і його немає в Google Play, але є можливим встановлення останньої версії з APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror завантаження:</string>
+    <string name="shortcut_to_editor_dialog_title">Ярлик редактора</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Ярлик для \"Сканування мобільних веж\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Ярлик \"Зчитати NFC мітку\"</string>
+    <string name="shortcut_to_dialog_lablel">Назва іконки ярлика:</string>
+    <string name="shortcut_to_dialog_create_button">Створити</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Сканування стільникових веж</string>
+    <string name="read_nfc_tag_short_shortcut_name">Прочитати мітку</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Більшість пристроїв мають об\'єднану \"Гучність дзвінка\" та \"Гучність системи\". Такі пристрої не мають опції для налаштування \"Гучності системи\". З цієї причини рекомендовано налаштувати \"Гучність дзвінка\", коли налаштовано \"Гучність системи\" або не налаштовувати \"Гучність системи\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">SIM увім/вимк</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">УВАГА: Буде потрібно ввести ПІН код для SIM карти яка буде увімкнута.</string>
+    <string name="menu_discord_server">PhoneProfilesPlus сервер</string>
+    <string name="menu_discord_invitation">Запрошення до сервера PhoneProfilesPlus</string>
 </resources>
diff --git a/common/src/main/res/values-vi/strings.xml b/common/src/main/res/values-vi/strings.xml
index 8d6e1565e1..35b08efe68 100644
--- a/common/src/main/res/values-vi/strings.xml
+++ b/common/src/main/res/values-vi/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">Chỉnh sửa</string>
     <string name="menu_settings">Cài đặt</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">Cấu hình mới</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rCN/strings.xml b/common/src/main/res/values-zh-rCN/strings.xml
index 301ed3097c..e365a7e1b5 100644
--- a/common/src/main/res/values-zh-rCN/strings.xml
+++ b/common/src/main/res/values-zh-rCN/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">编辑器</string>
     <string name="menu_settings">设置</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">情景设置</string>
     <string name="title_activity_event_preferences">事件设置</string>
     <string name="menu_new_profile">新建情景</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">自动旋转开启</string>
     <string name="array_pref_auto_rotate_off">自动旋转关闭</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">自适应级别的更改可能无法在您的设备上运行(例如：三星设备)。</string>
-    <string name="about_application_xda_developers_community">XDA开发者社区：</string>
     <string name="mobile_cells_pref_dlg_connected_cell">已连接基站：</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">移动基站注册需要一些权限。</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">新基站计数：</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">问题：</string>
     <string name="important_info_email_body_questions">问题：</string>
     <string name="important_info_email_body_suggestions">建议：</string>
-    <string name="about_application_support">支持：</string>
-    <string name="about_application_support2">联系：</string>
     <string name="about_application_support_subject">支持</string>
     <string name="dashclock_extension_description">以配置指示灯显示激活的情景。触碰时打开激活清单。</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">使用图标亮度自定义情景图标</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings 未安装 ！</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">未安装 PPPPutSettings</string>
     <string name="about_application_pppps_source_code">源代码 - PPPPutSettings：</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) LED 通知</string>
+    <string name="profile_preferences_notificationLed_23">LED 通知</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) 始终显示</string>
     <string name="samsung_edge_panel_settings_description">三星侧边栏设置</string>
     <string name="phone_profiles_pref_applicationCompactGrid">紧凑网格</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z) (R) Wi-Fi 和蓝牙确认对话框</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">\"HyperOs\"可禁用这些对话框。单击此处可禁用它们。注意：需要Shizuku/root。</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">在华为设备中存在 bug。因此，所有非交互类型可能无法正常工作。</string>
+    <string name="menu_check_releases_neostore">在 Neo Store 中检查</string>
+    <string name="check_releases_open_neostore">打开 Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">Neo Store 的 PhoneProfilesPlus 版本：</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">请在系统设置中启用定位和“Wi-Fi扫描”。否则传感器将无法工作。</string>
+    <string name="download_installWithOptions_title">下载 Installoptions.apk</string>
+    <string name="download_pppps_title">下载 PPPPutSettings.apk</string>
+    <string name="downloading_file_description">文件将存储到下载目录</string>
+    <string name="event_preferences_not_all_parameters_are_configured">一些参数未配置！</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">必须对这些参数进行配置，以确保事件功能正常。</string>
+    <string name="downloading_toast_text">正在下载…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">小部件： Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">关于 Dash Clock 的信息</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">点击这里显示 Dash Clock Widget 的信息。</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget 已废弃，不在Google Play中，但可以从 APKMirror 安装最新版本。</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror 下载：</string>
+    <string name="shortcut_to_editor_dialog_title">编辑器快捷方式</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">\"移动基站扫描\"的快捷方式</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">\"读取 NFC 标签”的快捷方式</string>
+    <string name="shortcut_to_dialog_lablel">快捷方式图标名称：</string>
+    <string name="shortcut_to_dialog_create_button">创建</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">基站扫描</string>
+    <string name="read_nfc_tag_short_shortcut_name">读取标签</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">大多数设备合并了 \"铃声音量 \"和 \"系统音量\"。这些设备在设置中没有 \"系统音量 \"的选项。因此，建议在配置 \"系统音量 \"时配置 \"铃声音量\"，或者不配置 \"系统音量\"。</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">切换 SIM 卡 开/关</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">警告：设为 \"开启 \"的 SIM 卡的解锁时将需要输入 PIN 码。</string>
+    <string name="menu_discord_server">PhoneProfilesPlus 服务器</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus 服务器邀请</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index 1e5f5f0948..f71fa5135e 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -4,7 +4,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <string name="menu_edit_profiles">編輯器</string>
     <string name="menu_settings">設置</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">設定檔偏好設定</string>
     <string name="title_activity_event_preferences">事件偏好設定</string>
     <string name="menu_new_profile">新設定檔</string>
@@ -885,7 +884,6 @@
     <string name="array_pref_auto_rotate_on">自動旋轉開</string>
     <string name="array_pref_auto_rotate_off">自動旋轉關</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">變更適應級別可能無法在您的裝置上運作 (例如: Samsung 裝置)。</string>
-    <string name="about_application_xda_developers_community">XDA-developers 社群:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">已連接基地台:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">行動基地台註冊需要部分權限。</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">新基地台合計:</string>
@@ -987,8 +985,6 @@
     <string name="important_info_email_body_problems">問題:</string>
     <string name="important_info_email_body_questions">疑問:</string>
     <string name="important_info_email_body_suggestions">建議:</string>
-    <string name="about_application_support">支援:</string>
-    <string name="about_application_support2">聯絡方式:</string>
     <string name="about_application_support_subject">支援</string>
     <string name="dashclock_extension_description">以偏好設定指示器顯示啟動中的設定檔. 輕點開啟啟動器.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">使用圖示亮度自訂設定檔圖示</string>
@@ -1932,7 +1928,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) 通知閃爍</string>
+    <string name="profile_preferences_notificationLed_23">通知閃爍</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) 一律顯示</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2163,7 +2159,7 @@
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
@@ -2187,4 +2183,32 @@
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+    <string name="downloading_toast_text">Downloading…</string>
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index af68c704a9..47f56329f6 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -8,7 +8,6 @@
     <string name="ppp_app_name" translatable="false">PhoneProfilesPlus</string>
     <string name="menu_edit_profiles">Editor</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_phone_profiles">PhoneProfilesPlus</string>
     <string name="title_activity_profile_preferences">Profile preferences</string>
     <string name="title_activity_event_preferences">Event preferences</string>
     <string name="menu_new_profile">New profile</string>
@@ -890,7 +889,6 @@
     <string name="array_pref_auto_rotate_on">Automatic rotation on</string>
     <string name="array_pref_auto_rotate_off">Automatic rotation off</string>
     <string name="brightness_pref_dialog_adaptive_level_may_not_working">Change of adaptive level may not work on your device (example: Samsung devices).</string>
-    <string name="about_application_xda_developers_community">XDA-developers community:</string>
     <string name="mobile_cells_pref_dlg_connected_cell">Connected cell:</string>
     <string name="permissions_for_mobile_cells_registration_dialog_text1">Mobile cell registration requires some permissions.</string>
     <string name="mobile_cells_registration_pref_dlg_status_new_cells_count">New cells count:</string>
@@ -993,8 +991,6 @@
     <string name="important_info_email_body_problems">Problems:</string>
     <string name="important_info_email_body_questions">Questions:</string>
     <string name="important_info_email_body_suggestions">Suggestions:</string>
-    <string name="about_application_support">Support:</string>
-    <string name="about_application_support2">contact:</string>
     <string name="about_application_support_subject">support</string>
     <string name="dashclock_extension_description">Displays active profile with preferences indicator. Opens Activator on touch.</string>
     <string name="phone_profiles_pref_applicationWidgetIconCustomIconLightness">Use icon lightness for custom profile icons</string>
@@ -1945,7 +1941,7 @@
     <string name="preferences_not_installed_PPPPutSettings_title">PPPPutSettings is not installed!</string>
     <string name="preference_not_allowed_reason_not_installed_ppps">not installed PPPPutSettings</string>
     <string name="about_application_pppps_source_code">Source code - PPPPutSettings:</string>
-    <string name="profile_preferences_notificationLed_23">(S)(R) Notification LED</string>
+    <string name="profile_preferences_notificationLed_23">Notification LED</string>
     <string name="profile_preferences_alwaysOnDisplay">(G1)(R) Always-On display</string>
     <string name="samsung_edge_panel_settings_description">Samsung edge panel settings</string>
     <string name="phone_profiles_pref_applicationCompactGrid">Compact grid</string>
@@ -2144,7 +2140,6 @@
     <string name="profile_preferences_deviceNetworkTypeSIM1">(Z)(R) Mobile network type for SIM 1</string>
     <string name="profile_preferences_deviceNetworkTypeSIM2">(Z)(R) Mobile network type for SIM 2</string>
     <string name="profile_preferences_deviceDefaultSIM">(Z)(R) Default SIM card</string>
-
     <string name="nfc_tag_pref_dlg_readNfcTag_title">Read NFC tag</string>
     <string name="nfc_tag_pref_dlg_readNfcTag_text">Read NFC tag written in PhonePorfilesPlus.</string>
     <string name="event_preferences_nfc_createReadNFCTagShortcut">Shortcut to \"Read NFC tag\"</string>
@@ -2161,10 +2156,8 @@
     <string name="nfc_tag_pref_dlg_writeToNfcTag_writeNameToTagAndAddNameButton">Write tag name to tag</string>
     <string name="nfc_tag_pref_dlg_writeToNfcTag_touch1">Attach your device to an NFC tag. Then click button</string>
     <string name="nfc_tag_pref_dlg_writeToNfcTag_touch2">Write will be started.</string>
-
     <string name="event_preferences_applications_duration">Applications run duration</string>
     <string name="event_preferences_applications_duration_unlimited">Unlimited</string>
-
     <string name="profile_preferences_category_phone_calls">Phone calls</string>
     <string name="profile_preferences_phoneCalls_setCallScreeningRole">Set call screening role</string>
     <string name="profile_preferences_phoneCalls_setCallScreeningRole_summary">Click here to set call screening role for PhoneProfilesPlus. Is required for \"Block phone calls\".</string>
@@ -2179,27 +2172,21 @@
     <string name="profile_preference_phoneCallsSendSMS">Send SMS</string>
     <string name="profile_preference_phoneCallsSMSText">SMS Text</string>
     <string name="profile_preference_phoneCalls_sendSMS_sumary">WARNING: Sending SMS may be charged or used from a prepaid SMS package!</string>
-
     <string name="notification_channel_notify_event_start_description_2">Is displayed, when event has enabled \"Start of event\"/\"Other parameters\"/\"Repeat notification\".</string>
     <string name="notification_channel_generated_by_profile_description_2">Is displayed, when profile has configured \"Others\"/\"Generate notification\".</string>
     <string name="notification_channel_profile_list_description_2">Is displayed, when is enabled \"Settings\"/\"Profile list notification\"/\"Display notification\"</string>
-
     <string name="do_not_disturb_access_permission_notification">Do not disturb access</string>
-    <string name="do_not_disturb_access_permission_notification_text">To displaying inportant PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
-
+    <string name="do_not_disturb_access_permission_notification_text">To displaying important PhoneProfilesPlus notifications, allow for PhoneProfilesPlus \"Do not disturb access\" in system settings. Click here to enable it.</string>
     <string name="no_error_dialog_message">The error has already been fixed.</string>
-
     <string name="application_editor_intent_test_activity_action_must_be_configured">\"Action\" must be configured.</string>
     <string name="application_editor_intent_test_activity_package_name_must_be_configured">\"Package name\" must be configured for intent type \"Broadcast\" with custom \"Action\".</string>
     <string name="application_editor_intent_test_broadcast_working_good">Broadcast working good</string>
-
     <string name="event_preference_sensor_music_summary">This sensor will start an event if music is playing. Parameters: Music state.</string>
     <string name="event_type_music">Music</string>
     <string name="event_preferences_category_eventMusicParameters">Music sensor</string>
     <string name="event_preferences_music_state">Music state</string>
     <string name="array_event_pref_music_state_playing">Music is playing</string>
     <string name="array_event_pref_music_state_not_playing">Music is not playing</string>
-
     <string name="install_pppps_text10">For Android 14+ is not normally possible to install PPPPutSettings directly on the device.</string>
     <string name="install_pppps_text11">But exists solution. This requires InstallWithOptions and Shizuku (if device is not rooted).</string>
     <string name="install_pppps_text12">How to proceed:</string> -- odriadkovanie
@@ -2209,16 +2196,62 @@
     <string name="install_pppps_text16">4. In InstallWithOptions enable: \"Bypass Low Target SDK Block\", \"Replace existing\".</string>
     <string name="install_pppps_text17">5. In InstallWithOptions use \"Choose file\" button, file: downloaded PPPPutSettings.apk.</string>
     <string name="install_pppps_text18">6. In InstallWithOptions use \"Install\" button.</string>
-
     <string name="profile_preferences_deviceImageWallpaperLockscreen">Image wallpaper for lock screen</string>
-
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs">(Z)(R) Wi-Fi and Bluetooth confirm dialogs</string>
     <string name="phone_profiles_pref_applicationHyperOsWifiBluetoothDialogs_summary">For \"HyperOs\" is possible to disable these dialogs. Click this to disable them. NOTE: It requires Shizuku/root.</string>
-
     <string name="profile_preferences_deviceWallpaperHuaweiInfo">In Huawei devices is bug. And for this reason may not properly working all non-interactive types.</string>
 
+    <string name="menu_check_releases_neostore">Check in Neo Store</string>
+    <string name="check_releases_open_neostore">Open Neo Store</string>
+    <string name="install_ppp_store_neostore" translatable="false">Neo Store</string>
+    <string name="check_releases_neostore_ppp_release">PhoneProfilesPlus release in Neo Store:</string>
+
+    <string name="phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29">Please enable Location and \"Wi-Fi scanning\" in System Settings. Without this, sensor will not work.</string>
+
+    <string name="download_installWithOptions_title">Download of InstallWithOptions.apk</string>
+    <string name="download_pppps_title">Download of PPPPutSettings.apk</string>
+
+    <string name="downloading_file_description">File will be stored into Downloads directory</string>
+
+    <string name="event_preferences_not_all_parameters_are_configured">Some parameters are not configured!</string>
+    <string name="event_preferences_not_all_parameters_are_configured_summary">These parameters must be configured for proper event functionality.</string>
+
+    <string name="downloading_toast_text">Downloading…</string>
+
+    <string name="title_activity_ppp" translatable="false">PPP</string>
+
+    <string name="phone_profiles_pref_category_widget_dash_clock">Widget: Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info">Info about Dash Clock</string>
+    <string name="phone_profiles_pref_widget_dash_clock_info_summary">Click here to show information about Dash Clock Widget.</string>
+    <string name="dash_clock_widget_info_1">Dash Clock Widget is deprecated and is not in Google Play, But is possible to install latest version from APKMirror.</string>
+    <string name="dash_clock_widget_info_2">Dash Clock Widget GitHub:</string>
+    <string name="dash_clock_widget_info_3">APKMirror download:</string>
+
+    <string name="shortcut_to_editor_dialog_title">Shortcut to Editor</string>
+    <string name="shortcut_to_mobile_cells_scanning_dialog_title">Shortcut to \"Mobile cells scanning\"</string>
+    <string name="shortcut_to_read_nfc_tag_dialog_title">Shortcut to \"Read NFC tag\"</string>
+    <string name="shortcut_to_dialog_lablel">Shortcut icon name:</string>
+    <string name="shortcut_to_dialog_create_button">Create</string>
+    <string name="mobile_cells_scanning_short_shortcut_name">Cells scan</string>
+    <string name="read_nfc_tag_short_shortcut_name">Read tag</string>
+
+    <string name="profile_preferences_volumeMergedRingSyatemVolumeInfo_summary">Most devices has merged \"Ringtone volume\" and \"System volume\". These devcies do not have option in device Settings to configure \"System volume\". For this reason, recommended is to configure \"Ringing volume\", when is configured \"System volume\" or do not configure \"System volume\".</string>
+
+    <string name="profile_preferences_deviceDualSIMPINCode_title">Switch SIM on/off</string>
+    <string name="profile_preferences_deviceDualSIMPINCode_summary">WARNING: This brings the PIN code entry screen for the SIM card that is configured as \"On\".</string>
+
+    <string name="menu_xda_developers" translatable="false">XDA-developers</string>
+    <string name="menu_discord" translatable="false">Discord</string>
+    <string name="menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="menu_discord_invitation">PhoneProfilesPlus server invitation</string>
+    <string name="menu_twitter" translatable="false">Twitter/X</string>
+    <string name="menu_reddit" translatable="false">Reddit</string>
+    <string name="menu_bluesky" translatable="false">Bluesky</string>
+
     <!-- **************************************************************************************** -->
 
+    <string name="extender_app_name" translatable="false">PhoneProfilesPlusExtender</string>
+    <string name="extender_title_activity_pppe" translatable="false">PPPE</string>
     <string name="extender_accessibility_service_description">Extender for PhoneProfilesPlus. It working only in conjunction with PhoneProfilesPlus.</string>
     <string name="extender_about_application_version">Version:</string>
     <string name="extender_accessibility_service_profile_force_stop_applications">Accessibility service for profile parameter \"Force stop applications\"</string>
@@ -2273,9 +2306,21 @@
     <string name="extender_accessibility_service_disabled_app_info_6">Then you must uninstall it, and install it from supported store, for example Droid-ify.</string>
     <string name="extender_accessibility_service_disabled_app_info_7">Click here to open Droid-ify installation site:</string>
     <string name="extender_accessibility_service_app_info_button">App info</string>
+    <string name="extender_menu_support">Support</string>
+    <string name="extender_support_subject">support</string>
+    <string name="extender_menu_email_to_author">E-mail to author</string>
+    <string name="extender_menu_xda_developers" translatable="false">XDA-developers</string>
+    <string name="extender_menu_discord" translatable="false">Discord</string>
+    <string name="extender_menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="extender_menu_discord_invitation">PhoneProfilesPlus server invitation</string>
+    <string name="extender_menu_twitter" translatable="false">Twitter/X</string>
+    <string name="extender_menu_reddit" translatable="false">Reddit</string>
+    <string name="extender_menu_bluesky" translatable="false">Bluesky</string>
 
     <!-- **************************************************************************************** -->
 
+    <string name="pppputsettings_app_name" translatable="false">PPPPutSettings</string>
+    <string name="pppputsettings_title_activity_pppps" translatable="false">PPPPS</string>
     <string name="pppputsettings_permission">PPPPutSettings application permisison</string>
     <string name="pppputsettings_application_releases">Releases:</string>
     <string name="pppputsettings_about_application_version">Version:</string>
@@ -2301,6 +2346,16 @@
     <string name="pppputsettings_modify_system_settings_granted">Granted</string>
     <string name="pppputsettings_modify_system_settings_not_granted">Not granted</string>
     <string name="pppputsettings_email_chooser">Send e-mail using</string>
+    <string name="pppputsettings_menu_support">Support</string>
+    <string name="pppputsettings_support_subject">support</string>
+    <string name="pppputsettings_menu_email_to_author">E-mail to author</string>
+    <string name="pppputsettings_menu_xda_developers" translatable="false">XDA-developers</string>
+    <string name="pppputsettings_menu_discord" translatable="false">Discord</string>
+    <string name="pppputsettings_menu_discord_server">PhoneProfilesPlus server</string>
+    <string name="pppputsettings_menu_discord_invitation">PhoneProfilesPlus server invitation</string>
+    <string name="pppputsettings_menu_twitter" translatable="false">Twitter/X</string>
+    <string name="pppputsettings_menu_reddit" translatable="false">Reddit</string>
+    <string name="pppputsettings_menu_bluesky" translatable="false">Bluesky</string>
 
 </resources>
 
diff --git a/cospravit.txt b/cospravit.txt
index 9d41fd9cc5..75c6c7d734 100644
--- a/cospravit.txt
+++ b/cospravit.txt
@@ -531,6 +531,16 @@ PPExtenderBroadcastReceiver:
 - onReceive() 0 false - kedy volane? - daj true, volane len raz, ked sa nakonektuje Extender
 
 ------------------
+
+Samsung, One UI 6. Problem je download apk cez ACTION_VIEW. Stale zobrazuje Downloading a hotovo.
+Cize tuto mam velky problem. Skus pozriet alebo pouzi DownloadManager. S21. Tych Samsungov je veľa.
+Cize to bude daky bug v Samsung One UI asi.
+Sranda, to iste robi Chrome aj ked priamo v nom otvorim InstallWithOtions releases a dam stiahnut.
+Problém je zjavne v Chrome. Keď dam default Samsung internet, žiaden problém s downloadom nie je.
+Alebo v One UI. Že je tam zlý downloader.
+
+-------------
+
 - Add: Added "Application run duration" into "Application sensor".
 - Add: "Phone calls" parameter for block calls.
 - Add: New senzor "Music sensor" to detect music playing.
@@ -573,3 +583,10 @@ PPExtenderBroadcastReceiver:
 
 - Fixed bugs.
 - Updated translations.
+
+------------
+
+Takze zatial kazdy mobil ma spriahnute ringing a system volume. Teda taky, co system nema v Settings.
+
+-----------------
+
diff --git a/dependencies.gradle b/dependencies.gradle
index 15a93bc377..e22dca33e8 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -39,16 +39,18 @@ ext.ppVersions = [
         // Must be used android.jar downloaded from https://github.com/Reginer/aosp-android-jar
         // Downloaded android.jar must be copied into PC into folder \<android-sdk\>/platforms/android-XX
 
-        publishVersion    : '6.5',
+        publishVersion    : '6.5.1',
 
-        publishVersionCode: 7140,
+        publishVersionCode: 7160,
 
         minSdk            : 26,
         targetSdk         : 28,
         compileSdk        : 34,
         buildTools        : '34.0.0',
 
-        appcompatXLib     : '1.6.1', //'1.5.1',
+        appcompatXLib     : '1.7.0', //'1.6.1', //'1.5.1',
+        kotlinStdlibJdk8  : '1.8.22', // appcompat 1.7.0 - dependencies problem, this fixed it
+
         recyclerView      : '1.3.2', //''1.3.1',
 
         autoservice       : '1.1.1',
diff --git a/docs/FDroid_ChangeLog.html b/docs/FDroid_ChangeLog.html
index 6368090847..c03086685e 100644
--- a/docs/FDroid_ChangeLog.html
+++ b/docs/FDroid_ChangeLog.html
@@ -7,46 +7,44 @@
 
 <h1 id="changelog">PhoneProfilesPlus Changelog</h1>
 
-<h2 id="version2">Version: 6.5</h2>
+<h2 id="version2">Version: 6.5.1</h2>
 
 <ul>
-    <li>Add: Added "Application run duration" into "Application sensor".</li>
-    <li>Add: "Phone calls" parameter for block calls.</li>
-    <li>Add: New senzor "Music sensor" to detect music playing.</li>
-    <li>Change: Fixed not working click to notification about new PPPPS version.</li>
-    <li>Change: Fixed not working notification about new PPP version.</li>
-    <li>Change: Increased delay between set sound mode and volumes.</li>
-    <li>Change: Fixed not working change of volume in DND Priority in Motorola.</li>
-    <li>Change: Better summary for profile parameter "Generate notification".</li>
-    <li>Change: Removed Galaxy Store form README.md.</li>
-    <li>Change: Removed Important info about Galaxy Store end of support.</li>
-    <li>Change: Fixed not working change of ringing volume when is set Priority DND, in all devices with Android 14+.</li>
-    <li>Change: Airplane mode parameters as sub-screen.</li>
-    <li>Change: Set wifi/on using "svc wifi" command, which do not generates prompt (HyperOs).</li>
-    <li>Change: Better notification channels descriptions.</li>
-    <li>Change: Bypass DND for some notifications.</li>
-    <li>Change: Set "Package name" as required for custom "Action" + "Broadcast".</li>
-    <li>Change: Displays toast from "Test" button for test of broadcast intent in Intent editor.</li>
-    <li>Change: Fixed show Important info about required versions of PPPE, PPPPS at PPP start.</li>
-    <li>Change: Installation of PPPPutSettings with InstallWithOptions.</li>
-    <li>Change: Profile parameter name "Lock screen" to "Unlock device".</li>
-    <li>Change: Added "Image wallpaper for lock screen" into profile "Change wallpaper".</li>
-    <li>Change: Disable "Wifi hotspot" SIM is not inserted.</li>
-    <li>Change: Disable "Default SIM card" if SIM is not inserted.</li>
-    <li>Change: Check more than 2 SIM cards in some profile/event parameters.</li>
-    <li>Change: Allowed activation form event for end of duration "Activate default profile".</li>
-    <li>Change: Allowed activation from event for end of duration "Undo the profile".</li>
-    <li>Change: Allowed activation from event for end of duration "Restart events".</li>
-    <li>Change: Save activated profile to FIFO when is activated manually.</li>
-    <li>Change: Added (Z) information into Important info for profiles.</li>
-    <li>Change: HyperOs - disable Wi-Fi, Bluetooth ON/OFF ask dialogs with appops command.</li>
-    <li>Change: Change wallpaper: added recycle() for bitmaps after set wallpaper.</li>
-    <li>Change: Change wallpaper in MIUI. Added info for not working good WallpaperManager.setBitmap().</li>
-    <li>Change: fixes in manifest file for activities with excludeFromRecents.</li>
-    <li>Change: Fixed close of foreground application when night mode is changed from profile.</li>
-    <li>Fix: Fixed not working "Screen timeout" in OnePlus. Requires root, Shizuku.</li>
-    <li>Fix: Color of row in Activity log.</li>
-    <li>Fix: Change wallpaper with "(I) Change to image with".</li>
+    <li>Added Neo Store into README.md.</li>
+    <li>Add: Dash Clock Widget in Settings.</li>
+    <li>Change: Added support for "Neo Store" for PPP, PPPE, PPPPS installation.</li>
+    <li>Change: Added support for "Neo Store".</li>
+    <li>Change: Installation of PPP, PPPE from GitHub.</li>
+    <li>Change: Applied patch #131, which fixes detection of mobile cells when is checked "Start when outside mobile cell".</li>
+    <li>Change: Detection of PPPPS if Shizuku is installed but PPPPS not. Use Shizuku instead.</li>
+    <li>Change: Do not use broadcast for start Activator/Editor from notification in API < 31. Not nedded it.</li>
+    <li>Change: Launcher for widgets, notification moved from "Application interface" to widgets, notification settings.</li>
+    <li>Change: Changed label of main activity to "PPP".</li>
+    <li>Change: Create shortcuts: added possibility to set icon name for shortcut.</li>
+    <li>Change: Added private constructor to utility classes (with all methods static).</li>
+    <li>Change: Added call of doAfterFirstStart when Shizuku is started.</li>
+    <li>Change: Added test for managers, adapters to check the enablement of the event sensor.</li>
+    <li>Change: "Music sensor": added support for detection of music controller.</li>
+    <li>Change: "Default SIM": added support for Android 13-. Maybe will be working in all devices.</li>
+    <li>Change: "SIM on/off": added support for Android 12+. Maybe will be working in all devices.</li>
+    <li>Change: Added button divider into Samsung edge panel.</li>
+    <li>Change: Added support for CellInfoNr into Mobile cells scanning. It is for 5G mobile net.</li>
+    <li>Change: Removed Support e-mail from "About application".</li>
+    <li>Change: Use Shizuku if PPPPS is not installed.</li>
+    <li>Change: Show red text about not granted Shizuku, if is running and PPPPS is also checked.</li>
+    <li>Change: Added required version of PPPPS.</li>
+    <li>Change: Added GMail, XDA-developers, Twitter, Reddit, Bluesky, Discord PPP server badge into README.md</li>
+    <li>Change: Added labels into README.md badges.</li>
+    <li>Change: Added XDA-developers, Twitter, Reddit, Bluesky, Discord into Editor "Support" menu.</li>
+    <li>Fixed appcompat 1.7.0 dependencies problem.</li>
+    <li>Fix: Fixed download url for InstallWithOptions.apk.</li>
+    <li>Fix: Force set Wi-Fi, Bluetooth, Mobile cells sensor not passed, when Location is disabled.</li>
+    <li>Fix: Installation of PPPPS for API 34+: download urls for InstallWithOptions.apk. and PPPPutSettings.apk.</li>
+    <li>Fix: Fixed show error when scanning is not enabled and is required for sensor.</li>
+    <li>Fix: Maybe fixed set volume during Priority DND.</li>
+    <li>Fix: Maybe fixed set volumes.</li>
+    <li>Fix: Simulating ringing call: Fixed check of mute ringing state. Must be checked not form system, but from activated profile.</li>
+    <li>Fix: Fixed check of settings, service commands.</li>
 </ul>
 
 <ul>
@@ -58,7 +56,7 @@ <h2 id="version2">Version: 6.5</h2>
 </ul>
 
 <p>
-    <a href="https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5">Release information on GitHub.</a>
+    <a href="https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5.1">Release information on GitHub.</a>
 </p>
 
 </body>
diff --git a/docs/FDroid_ChangeLog_CS.html b/docs/FDroid_ChangeLog_CS.html
index cfb2d11923..e645894025 100644
--- a/docs/FDroid_ChangeLog_CS.html
+++ b/docs/FDroid_ChangeLog_CS.html
@@ -7,46 +7,44 @@
 
 <h1 id="changelog">PhoneProfilesPlus Seznam změn</h1>
 
-<h2 id="version2">Verze: 6.5</h2>
+<h2 id="version2">Verze: 6.5.1</h2>
 
 <ul lang="en">
-    <li>Add: Added "Application run duration" into "Application sensor".</li>
-    <li>Add: "Phone calls" parameter for block calls.</li>
-    <li>Add: New senzor "Music sensor" to detect music playing.</li>
-    <li>Change: Fixed not working click to notification about new PPPPS version.</li>
-    <li>Change: Fixed not working notification about new PPP version.</li>
-    <li>Change: Increased delay between set sound mode and volumes.</li>
-    <li>Change: Fixed not working change of volume in DND Priority in Motorola.</li>
-    <li>Change: Better summary for profile parameter "Generate notification".</li>
-    <li>Change: Removed Galaxy Store form README.md.</li>
-    <li>Change: Removed Important info about Galaxy Store end of support.</li>
-    <li>Change: Fixed not working change of ringing volume when is set Priority DND, in all devices with Android 14+.</li>
-    <li>Change: Airplane mode parameters as sub-screen.</li>
-    <li>Change: Set wifi/on using "svc wifi" command, which do not generates prompt (HyperOs).</li>
-    <li>Change: Better notification channels descriptions.</li>
-    <li>Change: Bypass DND for some notifications.</li>
-    <li>Change: Set "Package name" as required for custom "Action" + "Broadcast".</li>
-    <li>Change: Displays toast from "Test" button for test of broadcast intent in Intent editor.</li>
-    <li>Change: Fixed show Important info about required versions of PPPE, PPPPS at PPP start.</li>
-    <li>Change: Installation of PPPPutSettings with InstallWithOptions.</li>
-    <li>Change: Profile parameter name "Lock screen" to "Unlock device".</li>
-    <li>Change: Added "Image wallpaper for lock screen" into profile "Change wallpaper".</li>
-    <li>Change: Disable "Wifi hotspot" SIM is not inserted.</li>
-    <li>Change: Disable "Default SIM card" if SIM is not inserted.</li>
-    <li>Change: Check more than 2 SIM cards in some profile/event parameters.</li>
-    <li>Change: Allowed activation form event for end of duration "Activate default profile".</li>
-    <li>Change: Allowed activation from event for end of duration "Undo the profile".</li>
-    <li>Change: Allowed activation from event for end of duration "Restart events".</li>
-    <li>Change: Save activated profile to FIFO when is activated manually.</li>
-    <li>Change: Added (Z) information into Important info for profiles.</li>
-    <li>Change: HyperOs - disable Wi-Fi, Bluetooth ON/OFF ask dialogs with appops command.</li>
-    <li>Change: Change wallpaper: added recycle() for bitmaps after set wallpaper.</li>
-    <li>Change: Change wallpaper in MIUI. Added info for not working good WallpaperManager.setBitmap().</li>
-    <li>Change: fixes in manifest file for activities with excludeFromRecents.</li>
-    <li>Change: Fixed close of foreground application when night mode is changed from profile.</li>
-    <li>Fix: Fixed not working "Screen timeout" in OnePlus. Requires root, Shizuku.</li>
-    <li>Fix: Color of row in Activity log.</li>
-    <li>Fix: Change wallpaper with "(I) Change to image with".</li>
+    <li>Added Neo Store into README.md.</li>
+    <li>Add: Dash Clock Widget in Settings.</li>
+    <li>Change: Added support for "Neo Store" for PPP, PPPE, PPPPS installation.</li>
+    <li>Change: Added support for "Neo Store".</li>
+    <li>Change: Installation of PPP, PPPE from GitHub.</li>
+    <li>Change: Applied patch #131, which fixes detection of mobile cells when is checked "Start when outside mobile cell".</li>
+    <li>Change: Detection of PPPPS if Shizuku is installed but PPPPS not. Use Shizuku instead.</li>
+    <li>Change: Do not use broadcast for start Activator/Editor from notification in API < 31. Not nedded it.</li>
+    <li>Change: Launcher for widgets, notification moved from "Application interface" to widgets, notification settings.</li>
+    <li>Change: Changed label of main activity to "PPP".</li>
+    <li>Change: Create shortcuts: added possibility to set icon name for shortcut.</li>
+    <li>Change: Added private constructor to utility classes (with all methods static).</li>
+    <li>Change: Added call of doAfterFirstStart when Shizuku is started.</li>
+    <li>Change: Added test for managers, adapters to check the enablement of the event sensor.</li>
+    <li>Change: "Music sensor": added support for detection of music controller.</li>
+    <li>Change: "Default SIM": added support for Android 13-. Maybe will be working in all devices.</li>
+    <li>Change: "SIM on/off": added support for Android 12+. Maybe will be working in all devices.</li>
+    <li>Change: Added button divider into Samsung edge panel.</li>
+    <li>Change: Added support for CellInfoNr into Mobile cells scanning. It is for 5G mobile net.</li>
+    <li>Change: Removed Support e-mail from "About application".</li>
+    <li>Change: Use Shizuku if PPPPS is not installed.</li>
+    <li>Change: Show red text about not granted Shizuku, if is running and PPPPS is also checked.</li>
+    <li>Change: Added required version of PPPPS.</li>
+    <li>Change: Added GMail, XDA-developers, Twitter, Reddit, Bluesky, Discord PPP server badge into README.md</li>
+    <li>Change: Added labels into README.md badges.</li>
+    <li>Change: Added XDA-developers, Twitter, Reddit, Bluesky, Discord into Editor "Support" menu.</li>
+    <li>Fixed appcompat 1.7.0 dependencies problem.</li>
+    <li>Fix: Fixed download url for InstallWithOptions.apk.</li>
+    <li>Fix: Force set Wi-Fi, Bluetooth, Mobile cells sensor not passed, when Location is disabled.</li>
+    <li>Fix: Installation of PPPPS for API 34+: download urls for InstallWithOptions.apk. and PPPPutSettings.apk.</li>
+    <li>Fix: Fixed show error when scanning is not enabled and is required for sensor.</li>
+    <li>Fix: Maybe fixed set volume during Priority DND.</li>
+    <li>Fix: Maybe fixed set volumes.</li>
+    <li>Fix: Simulating ringing call: Fixed check of mute ringing state. Must be checked not form system, but from activated profile.</li>
+    <li>Fix: Fixed check of settings, service commands.</li>
 </ul>
 
 <ul>
@@ -58,7 +56,7 @@ <h2 id="version2">Verze: 6.5</h2>
 </ul>
 
 <p>
-    <a href="https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5">Informace o vydání na GitHub.</a>
+    <a href="https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5.1">Informace o vydání na GitHub.</a>
 </p>
 
 </body>
diff --git a/docs/FDroid_ChangeLog_SK.html b/docs/FDroid_ChangeLog_SK.html
index 8fc91fae0b..1a865ca54c 100644
--- a/docs/FDroid_ChangeLog_SK.html
+++ b/docs/FDroid_ChangeLog_SK.html
@@ -7,46 +7,44 @@
 
 <h1 id="changelog">PhoneProfilesPlus Zoznam zmien</h1>
 
-<h2 id="version2">Verzia: 6.5</h2>
+<h2 id="version2">Verzia: 6.5.1</h2>
 
 <ul lang="en">
-    <li>Add: Added "Application run duration" into "Application sensor".</li>
-    <li>Add: "Phone calls" parameter for block calls.</li>
-    <li>Add: New senzor "Music sensor" to detect music playing.</li>
-    <li>Change: Fixed not working click to notification about new PPPPS version.</li>
-    <li>Change: Fixed not working notification about new PPP version.</li>
-    <li>Change: Increased delay between set sound mode and volumes.</li>
-    <li>Change: Fixed not working change of volume in DND Priority in Motorola.</li>
-    <li>Change: Better summary for profile parameter "Generate notification".</li>
-    <li>Change: Removed Galaxy Store form README.md.</li>
-    <li>Change: Removed Important info about Galaxy Store end of support.</li>
-    <li>Change: Fixed not working change of ringing volume when is set Priority DND, in all devices with Android 14+.</li>
-    <li>Change: Airplane mode parameters as sub-screen.</li>
-    <li>Change: Set wifi/on using "svc wifi" command, which do not generates prompt (HyperOs).</li>
-    <li>Change: Better notification channels descriptions.</li>
-    <li>Change: Bypass DND for some notifications.</li>
-    <li>Change: Set "Package name" as required for custom "Action" + "Broadcast".</li>
-    <li>Change: Displays toast from "Test" button for test of broadcast intent in Intent editor.</li>
-    <li>Change: Fixed show Important info about required versions of PPPE, PPPPS at PPP start.</li>
-    <li>Change: Installation of PPPPutSettings with InstallWithOptions.</li>
-    <li>Change: Profile parameter name "Lock screen" to "Unlock device".</li>
-    <li>Change: Added "Image wallpaper for lock screen" into profile "Change wallpaper".</li>
-    <li>Change: Disable "Wifi hotspot" SIM is not inserted.</li>
-    <li>Change: Disable "Default SIM card" if SIM is not inserted.</li>
-    <li>Change: Check more than 2 SIM cards in some profile/event parameters.</li>
-    <li>Change: Allowed activation form event for end of duration "Activate default profile".</li>
-    <li>Change: Allowed activation from event for end of duration "Undo the profile".</li>
-    <li>Change: Allowed activation from event for end of duration "Restart events".</li>
-    <li>Change: Save activated profile to FIFO when is activated manually.</li>
-    <li>Change: Added (Z) information into Important info for profiles.</li>
-    <li>Change: HyperOs - disable Wi-Fi, Bluetooth ON/OFF ask dialogs with appops command.</li>
-    <li>Change: Change wallpaper: added recycle() for bitmaps after set wallpaper.</li>
-    <li>Change: Change wallpaper in MIUI. Added info for not working good WallpaperManager.setBitmap().</li>
-    <li>Change: fixes in manifest file for activities with excludeFromRecents.</li>
-    <li>Change: Fixed close of foreground application when night mode is changed from profile.</li>
-    <li>Fix: Fixed not working "Screen timeout" in OnePlus. Requires root, Shizuku.</li>
-    <li>Fix: Color of row in Activity log.</li>
-    <li>Fix: Change wallpaper with "(I) Change to image with".</li>
+    <li>Added Neo Store into README.md.</li>
+    <li>Add: Dash Clock Widget in Settings.</li>
+    <li>Change: Added support for "Neo Store" for PPP, PPPE, PPPPS installation.</li>
+    <li>Change: Added support for "Neo Store".</li>
+    <li>Change: Installation of PPP, PPPE from GitHub.</li>
+    <li>Change: Applied patch #131, which fixes detection of mobile cells when is checked "Start when outside mobile cell".</li>
+    <li>Change: Detection of PPPPS if Shizuku is installed but PPPPS not. Use Shizuku instead.</li>
+    <li>Change: Do not use broadcast for start Activator/Editor from notification in API < 31. Not nedded it.</li>
+    <li>Change: Launcher for widgets, notification moved from "Application interface" to widgets, notification settings.</li>
+    <li>Change: Changed label of main activity to "PPP".</li>
+    <li>Change: Create shortcuts: added possibility to set icon name for shortcut.</li>
+    <li>Change: Added private constructor to utility classes (with all methods static).</li>
+    <li>Change: Added call of doAfterFirstStart when Shizuku is started.</li>
+    <li>Change: Added test for managers, adapters to check the enablement of the event sensor.</li>
+    <li>Change: "Music sensor": added support for detection of music controller.</li>
+    <li>Change: "Default SIM": added support for Android 13-. Maybe will be working in all devices.</li>
+    <li>Change: "SIM on/off": added support for Android 12+. Maybe will be working in all devices.</li>
+    <li>Change: Added button divider into Samsung edge panel.</li>
+    <li>Change: Added support for CellInfoNr into Mobile cells scanning. It is for 5G mobile net.</li>
+    <li>Change: Removed Support e-mail from "About application".</li>
+    <li>Change: Use Shizuku if PPPPS is not installed.</li>
+    <li>Change: Show red text about not granted Shizuku, if is running and PPPPS is also checked.</li>
+    <li>Change: Added required version of PPPPS.</li>
+    <li>Change: Added GMail, XDA-developers, Twitter, Reddit, Bluesky, Discord PPP server badge into README.md</li>
+    <li>Change: Added labels into README.md badges.</li>
+    <li>Change: Added XDA-developers, Twitter, Reddit, Bluesky, Discord into Editor "Support" menu.</li>
+    <li>Fixed appcompat 1.7.0 dependencies problem.</li>
+    <li>Fix: Fixed download url for InstallWithOptions.apk.</li>
+    <li>Fix: Force set Wi-Fi, Bluetooth, Mobile cells sensor not passed, when Location is disabled.</li>
+    <li>Fix: Installation of PPPPS for API 34+: download urls for InstallWithOptions.apk. and PPPPutSettings.apk.</li>
+    <li>Fix: Fixed show error when scanning is not enabled and is required for sensor.</li>
+    <li>Fix: Maybe fixed set volume during Priority DND.</li>
+    <li>Fix: Maybe fixed set volumes.</li>
+    <li>Fix: Simulating ringing call: Fixed check of mute ringing state. Must be checked not form system, but from activated profile.</li>
+    <li>Fix: Fixed check of settings, service commands.</li>
 </ul>
 
 <ul>
@@ -58,7 +56,7 @@ <h2 id="version2">Verzia: 6.5</h2>
 </ul>
 
 <p>
-    <a href="https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5">Informácie o vydaní na GitHub.</a>
+    <a href="https://github.com/henrichg/PhoneProfilesPlus/releases/tag/6.5.1">Informácie o vydaní na GitHub.</a>
 </p>
 
 </body>
diff --git a/docs/permissions.md b/docs/permissions.md
index ddadf920af..f4fd4e8b9e 100644
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -20,7 +20,7 @@ Permissions
 - MODIFY_PHONE_STATE
 - NFC
 - POST_NOTIFICATIONS
-- READ_CALENDAR
+- READ_CALENDAR (needed to get calendar events by Calendar sensor)
 - READ_CONTACTS (needed to fill contact cache, required in event Call sensor, SMS sensor)
 - READ_EXTERNAL_STORAGE (needed to restore PPP Settings from backups)
 - READ_PHONE_STATE (needed to trigger profiles on call events and mobile cells)
@@ -31,7 +31,7 @@ Permissions
 - SEND_SMS (needed for sending SMS, if it is enabled in profile parameter "Phone calls")
 - SET_WALLPAPER
 - SYSTEM_ALERT_WINDOW (needed to e.g. run some invisible activities (Screen brightness, Screen timeout, Keep screen on))
-- android.permission.TETHER_PRIVILEGED
+- TETHER_PRIVILEGED
 - VIBRATE
 - WAKE_LOCK
 - WRITE_EXTERNAL_STORAGE (needed to save PPP Settings to backups)
@@ -39,10 +39,10 @@ Permissions
 - WRITE_SETTINGS
 - WRITE_SYNC_SETTINGS
 - INSTALL_SHORTCUT
+- DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
 - com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY (needed for Samsung Edge panel)
 - com.wireguard.android.permission.CONTROL_TUNNELS (needed for WireGuard, if is used in profile parameter "VPN")
 - moe.shizuku.manager.permission.API_V23 (needed for Shizuku)
-- sk.henrichg.phoneprofilesplus.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
 - sk.henrichg.phoneprofilesplusextender.ACCESSIBILITY_SERVICE_PERMISSION (needed for send/receive broadcast to/from PhoneProfilesPlusExtender)
 - sk.henrichg.pppputsettings.PPP_PUT_SETTINGS_PERMISSION  (needed for send/receive broadcast to/from PPPPutSettings)
 
diff --git a/docs/releases-debug.md b/docs/releases-debug.md
index 8e514317b5..77f4bfd0ff 100644
--- a/docs/releases-debug.md
+++ b/docs/releases-debug.md
@@ -1 +1 @@
-@@@ppp-release:6.5:7140:normal***@@@
\ No newline at end of file
+@@@ppp-release:6.5.1:7160:normal***@@@
\ No newline at end of file
diff --git a/docs/releases.md b/docs/releases.md
index 8e514317b5..77f4bfd0ff 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -1 +1 @@
-@@@ppp-release:6.5:7140:normal***@@@
\ No newline at end of file
+@@@ppp-release:6.5.1:7160:normal***@@@
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b8630e8c40..a37b3a566e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/noobcameraflash/build.gradle b/noobcameraflash/build.gradle
index cf6fc99112..380a4672b9 100644
--- a/noobcameraflash/build.gradle
+++ b/noobcameraflash/build.gradle
@@ -30,9 +30,12 @@ android {
 dependencies {
     //compile fileTree(include: ['*.jar'], dir: 'libs')
 
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
+
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
 }
diff --git a/noobcameraflash/src/main/java/com/noob/noobcameraflash/utilities/CameraUtilMarshMallow.java b/noobcameraflash/src/main/java/com/noob/noobcameraflash/utilities/CameraUtilMarshMallow.java
index b5f8332425..6e6a2021cf 100644
--- a/noobcameraflash/src/main/java/com/noob/noobcameraflash/utilities/CameraUtilMarshMallow.java
+++ b/noobcameraflash/src/main/java/com/noob/noobcameraflash/utilities/CameraUtilMarshMallow.java
@@ -4,6 +4,7 @@
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -22,7 +23,15 @@ public CameraUtilMarshMallow(Context context) throws CameraAccessException {
     private void openCamera() throws CameraAccessException {
         if (mCameraManager == null)
             mCameraManager = (CameraManager) getContext().getSystemService(Context.CAMERA_SERVICE);
-        if (isFlashAvailable()) {
+
+        // check for all cameras
+        boolean flashAvailable = false;
+        String[] cameraIds = mCameraManager.getCameraIdList();
+        for (String id : cameraIds) {
+            flashAvailable = isFlashAvailable(id);
+        }
+
+        if (flashAvailable /*isFlashAvailable()*/) {
             mTorchCallback = new CameraManager.TorchCallback() {
                 @Override
                 public void onTorchModeUnavailable(@NonNull String cameraId) {
@@ -43,41 +52,61 @@ public void onTorchModeChanged(@NonNull String cameraId, boolean enabled) {
         }
     }
 
-    private boolean isFlashAvailable() throws CameraAccessException {
-        CameraCharacteristics cameraCharacteristics = mCameraManager.getCameraCharacteristics("0");
+    private boolean isFlashAvailable(String cameraId) throws CameraAccessException {
+        CameraCharacteristics cameraCharacteristics = mCameraManager.getCameraCharacteristics(cameraId /*"0"*/);
         return cameraCharacteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
     }
 
     @Override
     public void turnOnFlash() throws CameraAccessException {
+        boolean torchSet = false;
         String[] cameraIds = getCameraManager().getCameraIdList();
         for (String id : cameraIds) {
-            CameraCharacteristics characteristics = getCameraManager().getCameraCharacteristics(id);
-            if (characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
-                // added facing check - allowed is only back flash
-                Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
-                if ((facing != null) && (facing == CameraCharacteristics.LENS_FACING_BACK)) {
-                    getCameraManager().setTorchMode(id, true);
-                    //setTorchMode(TorchMode.SwitchedOn);
+            // only log exception, because for all cameras must be set torch
+            try {
+                CameraCharacteristics characteristics = getCameraManager().getCameraCharacteristics(id);
+                if (characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
+                    // added facing check - allowed is only back flash
+                    Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
+                    if ((facing != null) && (facing == CameraCharacteristics.LENS_FACING_BACK)) {
+                        getCameraManager().setTorchMode(id, true);
+                        //setTorchMode(TorchMode.SwitchedOn);
+                        torchSet = true;
+                    }
                 }
+            } catch (Exception e) {
+                Log.e("CameraUtilMarshMallow.turnOnFlash", Log.getStackTraceString(e));
             }
         }
+        if (!torchSet) {
+            throw new CameraAccessException(CameraAccessException.CAMERA_ERROR);
+        }
     }
 
     @Override
     public void turnOffFlash() throws CameraAccessException {
+        boolean torchSet = false;
         String[] cameraIds = getCameraManager().getCameraIdList();
         for (String id : cameraIds) {
-            CameraCharacteristics characteristics = getCameraManager().getCameraCharacteristics(id);
-            if (characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
-                // added facing check - allowed is only back flash
-                Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
-                if ((facing != null) && (facing == CameraCharacteristics.LENS_FACING_BACK)) {
-                    getCameraManager().setTorchMode(id, false);
-                    //setTorchMode(TorchMode.SwitchedOff);
+            // only log exception, because for all cameras must be set torch
+            try {
+                CameraCharacteristics characteristics = getCameraManager().getCameraCharacteristics(id);
+                if (characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE)) {
+                    // added facing check - allowed is only back flash
+                    Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
+                    if ((facing != null) && (facing == CameraCharacteristics.LENS_FACING_BACK)) {
+                        getCameraManager().setTorchMode(id, false);
+                        //setTorchMode(TorchMode.SwitchedOff);
+                        torchSet = true;
+                    }
                 }
+            } catch (Exception e) {
+                Log.e("CameraUtilMarshMallow.turnOffFlash", Log.getStackTraceString(e));
             }
         }
+        if (!torchSet) {
+            throw new CameraAccessException(CameraAccessException.CAMERA_ERROR);
+        }
     }
 
     @Override
diff --git a/phoneProfilesPlus/build.gradle b/phoneProfilesPlus/build.gradle
index fef1561dfa..ed2cb4fa19 100644
--- a/phoneProfilesPlus/build.gradle
+++ b/phoneProfilesPlus/build.gradle
@@ -81,7 +81,7 @@ dependencies {
     implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3'
 
     /// ACRA
-    implementation "com.google.guava:guava:33.0.0-android" //32.1.3-android"
+    implementation "com.google.guava:guava:33.2.1-android" //33.0.0-android"
     implementation "ch.acra:acra-mail:$ppVersions.acra"
     implementation "ch.acra:acra-notification:$ppVersions.acra"
     // https://github.com/ACRA/acra/tree/master/examples/acra-basic-java-example
@@ -110,12 +110,15 @@ dependencies {
     //noinspection GradleDependency
     implementation 'androidx.preference:preference:1.1.1'
 
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
 
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
+
     //1.11.0' is not good, not working dynamic colors
     //https://github.com/material-components/material-components-android/issues/3924
     //noinspection GradleDependency
@@ -128,7 +131,7 @@ dependencies {
     implementation 'org.osmdroid:osmdroid-android:6.1.18'
 
     /// for json usage in some preferenses (wifi, bluetooth connection, scanning, ...)
-    implementation 'com.google.code.gson:gson:2.10.1' //2.9.1'
+    implementation 'com.google.code.gson:gson:2.11.0' //2.10.1'
 
     /// for DashClock support
     implementation 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
diff --git a/phoneProfilesPlus/src/debug/java/sk/henrichg/phoneprofilesplus/DebugVersion.java b/phoneProfilesPlus/src/debug/java/sk/henrichg/phoneprofilesplus/DebugVersion.java
index 7baaa183a1..0e05ded7b0 100644
--- a/phoneProfilesPlus/src/debug/java/sk/henrichg/phoneprofilesplus/DebugVersion.java
+++ b/phoneProfilesPlus/src/debug/java/sk/henrichg/phoneprofilesplus/DebugVersion.java
@@ -57,19 +57,19 @@ static boolean debugMenuItems(int menuItem, Activity activity) {
 
             soundModeString = soundModeString + "\nZen mode=";
             switch (ActivateProfileHelper.getSystemZenMode(activity.getApplicationContext())) {
-                case ActivateProfileHelper.ZENMODE_ALL:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_ALL:
                     soundModeString = soundModeString + "ZENMODE_ALL";
                     break;
-                case ActivateProfileHelper.ZENMODE_PRIORITY:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY:
                     soundModeString = soundModeString + "ZENMODE_PRIORITY";
                     break;
-                case ActivateProfileHelper.ZENMODE_ALARMS:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_ALARMS:
                     soundModeString = soundModeString + "ZENMODE_ALARMS";
                     break;
-                case ActivateProfileHelper.ZENMODE_NONE:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_NONE:
                     soundModeString = soundModeString + "ZENMODE_NONE";
                     break;
-                case ActivateProfileHelper.ZENMODE_SILENT:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_SILENT:
                     soundModeString = soundModeString + "ZENMODE_SILENT";
                     break;
             }
diff --git a/phoneProfilesPlus/src/main/AndroidManifest.xml b/phoneProfilesPlus/src/main/AndroidManifest.xml
index 435e360754..b67a85c45f 100644
--- a/phoneProfilesPlus/src/main/AndroidManifest.xml
+++ b/phoneProfilesPlus/src/main/AndroidManifest.xml
@@ -76,6 +76,8 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.SEND_SMS" />
 
+<!--    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" tools:ignore="ProtectedPermissions" />-->
+
     <uses-permission android:name="sk.henrichg.phoneprofilesplusextender.ACCESSIBILITY_SERVICE_PERMISSION"/>
     <uses-permission android:name="sk.henrichg.pppputsettings.PPP_PUT_SETTINGS_PERMISSION"/>
 
@@ -244,7 +246,7 @@
         <!-- !!! android:theme must be set here -->
         <activity
             android:name=".ActivatorActivity"
-            android:label="@string/title_activity_phone_profiles"
+            android:label="@string/title_activity_ppp"
             android:excludeFromRecents="true"
             android:taskAffinity="sk.henrichg.phoneprofilesplus.activator"
             android:launchMode="singleInstance"
@@ -256,6 +258,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <!--            android:label="@string/title_activity_phone_profiles"-->
 
         <!-- android:theme must be used, because of flickering of withe bacground in Huawei -->
         <activity
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/AboutApplicationActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/AboutApplicationActivity.java
index dbfac4ac0c..ef06ec822a 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/AboutApplicationActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/AboutApplicationActivity.java
@@ -5,9 +5,7 @@
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextPaint;
@@ -77,12 +75,14 @@ protected void onCreate(Bundle savedInstanceState) {
         sbt.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         text.setText(sbt);
 
+        /*
         emailMe(findViewById(R.id.about_application_support),
                 getString(R.string.about_application_support),
                 getString(R.string.about_application_support2),
                 getString(R.string.about_application_support_subject),
-                getEmailBodyText(/*EMAIL_BODY_SUPPORT, */this),
-                /*true,*/this);
+                getEmailBodyText(this),
+                this);
+        */
 
         text = findViewById(R.id.about_application_translations);
         str1 = getString(R.string.about_application_translations);
@@ -265,6 +265,7 @@ public void onClick(@NonNull View textView) {
         text.setText(sbt);
         text.setMovementMethod(LinkMovementMethod.getInstance());
 
+        /*
         text = findViewById(R.id.about_application_xda_developers_community);
         str1 = getString(R.string.about_application_xda_developers_community);
         str2 = str1 + StringConstants.CHAR_NEW_LINE + PPApplication.XDA_DEVELOPERS_PPP_URL + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
@@ -293,6 +294,7 @@ public void onClick(@NonNull View textView) {
         //sbt.setSpan(new UnderlineSpan(), str1.length()+1, str2.length(), 0);
         text.setText(sbt);
         text.setMovementMethod(LinkMovementMethod.getInstance());
+        */
 
         /*
         text = findViewById(R.id.about_application_google_plus_community);
@@ -452,71 +454,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     }
 
-    static void emailMe(final TextView textView, final String text, final String linkText, final String subjectText,
-                        final String bodyText, /*final boolean boldLink,*/ final Context context) {
-        String strNoLink = text + " " + linkText;
-        String str2 = strNoLink + StringConstants.CHAR_NEW_LINE + StringConstants.AUTHOR_EMAIL + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
-        Spannable sbt = new SpannableString(str2);
-        sbt.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, strNoLink.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        ClickableSpan clickableSpan = new ClickableSpan() {
-            @Override
-            public void updateDrawState(TextPaint ds) {
-                ds.setColor(ds.linkColor);    // you can use custom color
-                ds.setUnderlineText(false);    // this remove the underline
-            }
-
-            @Override
-            public void onClick(@NonNull View textView) {
-                Intent intent = new Intent(Intent.ACTION_SENDTO);
-                intent.setData(Uri.parse(StringConstants.INTENT_DATA_MAIL_TO_COLON)); // only email apps should handle this
-                String[] email = { StringConstants.AUTHOR_EMAIL };
-                intent.putExtra(Intent.EXTRA_EMAIL, email);
-                String packageVersion = "";
-                try {
-                    PackageInfo pInfo = context.getPackageManager().getPackageInfo(PPApplication.PACKAGE_NAME, 0);
-                    packageVersion = " - v" + pInfo.versionName + " (" + PPApplicationStatic.getVersionCode(pInfo) + ")";
-                } catch (Exception e) {
-                    PPApplicationStatic.recordException(e);
-                }
-                if (subjectText.isEmpty())
-                    intent.putExtra(Intent.EXTRA_SUBJECT, StringConstants.PHONE_PROFILES_PLUS + packageVersion);
-                else
-                    intent.putExtra(Intent.EXTRA_SUBJECT, StringConstants.PHONE_PROFILES_PLUS + packageVersion + " - " + subjectText);
-                if (!bodyText.isEmpty())
-                    intent.putExtra(Intent.EXTRA_TEXT, bodyText);
-                try {
-                    context.startActivity(Intent.createChooser(intent, context.getString(R.string.email_chooser)));
-                } catch (Exception e) {
-                    PPApplicationStatic.recordException(e);
-                }
-            }
-        };
-        sbt.setSpan(clickableSpan, strNoLink.length()+1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        //if (boldLink)
-            sbt.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), strNoLink.length()+1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        //else
-        //    sbt.setSpan(new UnderlineSpan(), strNoLink.length()+1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        textView.setText(sbt);
-        textView.setMovementMethod(LinkMovementMethod.getInstance());
-    }
-
-    static String getEmailBodyText(/*int bodyType, */Context context) {
-        String body;
-        //switch (bodyType) {
-        //    case EMAIL_BODY_SUPPORT:
-                body = context.getString(R.string.important_info_email_body_device) + " " +
-                        Settings.Global.getString(context.getContentResolver(), Settings.Global.DEVICE_NAME) +
-                        " (" + Build.MODEL + ")" + StringConstants.STR_NEWLINE_WITH_SPACE;
-                body = body + context.getString(R.string.important_info_email_body_android_version) + " " + Build.VERSION.RELEASE + StringConstants.STR_DOUBLE_NEWLINE_WITH_SPACE;
-                body = body + context.getString(R.string.important_info_email_body_problems) + StringConstants.STR_NEWLINE_WITH_SPACE;
-                body = body + context.getString(R.string.important_info_email_body_questions) + StringConstants.STR_NEWLINE_WITH_SPACE;
-                body = body + context.getString(R.string.important_info_email_body_suggestions) + StringConstants.STR_DOUBLE_NEWLINE_WITH_SPACE;
-        /*        break;
-            case EMAIL_BODY_TRANSLATIONS:
-                body = context.getString(R.string.important_info_email_body_translation_language_to) + StringConstants.STR_DOUBLE_NEWLINE_WITH_SPACE;
-                break;
-        }*/
-        return body;
-    }
-
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActionForExternalApplicationActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActionForExternalApplicationActivity.java
index 81130b7ea4..adad1b9efc 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActionForExternalApplicationActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActionForExternalApplicationActivity.java
@@ -128,6 +128,7 @@ protected void onStart()
                     serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APPLICATION, true);
                     serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_ACTION, action);
                 }
+                serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //                PPApplicationStatic.logE("[START_PP_SERVICE] ActionForExternalApplicationActivity.onStart", "xxx");
                 PPApplicationStatic.startPPService(this, serviceIntent, true);
                 finish();
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivateProfileHelper.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivateProfileHelper.java
index 842a59e297..b7f1a6f671 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivateProfileHelper.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivateProfileHelper.java
@@ -89,11 +89,11 @@ class ActivateProfileHelper {
     //static final String ADAPTIVE_BRIGHTNESS_SETTING_NAME = "screen_auto_brightness_adj";
 
     // Setting.Global "zen_mode"
-    static final int ZENMODE_ALL = 0;
-    static final int ZENMODE_PRIORITY = 1;
-    static final int ZENMODE_NONE = 2;
-    static final int ZENMODE_ALARMS = 3;
-    static final int ZENMODE_SILENT = 99;
+    static final int SYSTEM_ZENMODE_ALL = 0;
+    static final int SYSTEM_ZENMODE_PRIORITY = 1;
+    static final int SYSTEM_ZENMODE_NONE = 2;
+    static final int SYSTEM_ZENMODE_ALARMS = 3;
+    static final int SYSTEM_ZENMODE_SILENT = 99;
 
     static final int SUBSCRIPTRION_VOICE = 1;
     static final int SUBSCRIPTRION_SMS = 2;
@@ -138,6 +138,9 @@ class ActivateProfileHelper {
 //    private static final String PPPPS_SETTINGS_TYPE_SPECIAL = "setting_type_special";
 //    private static final String SETTINGS_SET_WIFI_ENABLED = "setWifiEnabled";
 
+    private ActivateProfileHelper() {
+        // private constructor to prevent instantiation
+    }
 
     @SuppressLint("MissingPermission")
     private static void doExecuteForRadios(Context context, Profile profile, SharedPreferences executedProfileSharedPreferences)
@@ -230,6 +233,7 @@ private static void doExecuteForRadios(Context context, Profile profile, SharedP
                     String[] splits = profile._deviceDefaultSIMCards.split(StringConstants.STR_SPLIT_REGEX);
                     if (splits.length == 3) {
                         try {
+                            // voice
                             String voice = splits[0];
                             if (!voice.equals("0")) {
 //                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.doExecuteForRadios", "voice value="+Integer.parseInt(voice));
@@ -239,6 +243,7 @@ private static void doExecuteForRadios(Context context, Profile profile, SharedP
                             PPApplicationStatic.recordException(e);
                         }
                         try {
+                            // SMS
                             String sms = splits[1];
                             if (!sms.equals("0")) {
 //                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.doExecuteForRadios", "sms value="+Integer.parseInt(sms));
@@ -248,6 +253,7 @@ private static void doExecuteForRadios(Context context, Profile profile, SharedP
                             PPApplicationStatic.recordException(e);
                         }
                         try {
+                            // data
                             String data = splits[2];
                             if (!data.equals("0")) {
 //                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.doExecuteForRadios", "data value="+Integer.parseInt(data));
@@ -1076,15 +1082,15 @@ static boolean isAudibleSystemRingerMode(AudioManager audioManager, int systemZe
 
         boolean audibleRingerMode;
         // In AOSP, when systemZenMode == ActivateProfileHelper.ZENMODE_PRIORITY, systemRingerMode == AudioManager.RINGER_MODE_SILENT :-/
-        if (systemZenMode == ActivateProfileHelper.ZENMODE_PRIORITY) {
+        if (systemZenMode == ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY) {
             audibleRingerMode = (systemRingerMode == AudioManager.RINGER_MODE_NORMAL) ||
                                     (systemRingerMode == AudioManager.RINGER_MODE_SILENT);
         }
         else
             audibleRingerMode = systemRingerMode == AudioManager.RINGER_MODE_NORMAL;
         boolean audibleZenMode = (systemZenMode == -1) ||
-                                 (systemZenMode == ActivateProfileHelper.ZENMODE_ALL) ||
-                                 (systemZenMode == ActivateProfileHelper.ZENMODE_PRIORITY);
+                                 (systemZenMode == ActivateProfileHelper.SYSTEM_ZENMODE_ALL) ||
+                                 (systemZenMode == ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY);
         return audibleRingerMode && audibleZenMode;
     }
 
@@ -1205,11 +1211,23 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
 
         Context appContext = context.getApplicationContext();
 
+        //int systemRingVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
+        //int systemNotificationVolume = audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION);
+        //int systemMusicVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+        //int systemAlarmVolume = audioManager.getStreamVolume(AudioManager.STREAM_ALARM);
+        //int systemVoiceCallVolume = audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
+        //int systemBluetoothSCOVolume = audioManager.getStreamVolume(AudioManager.STREAM_BLUETOOTH_SCO);
+        //int systemSystemVolume = audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM);
+        //int systemDTMFVolume = audioManager.getStreamVolume(AudioManager.STREAM_DTMF);
+        //int systemAccessibilityVolume = audioManager.getStreamVolume(AudioManager.STREAM_ACCESSIBILITY);
+
+//        Log.e("ActivateProfileHelper.setVolumes", "system system volume="+audioManager.getStreamVolume(AudioManager.STREAM_RING));
+//        Log.e("ActivateProfileHelper.setVolumes", "system ringing volume="+audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION));
+//        Log.e("ActivateProfileHelper.setVolumes", "system notification volume="+audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION));
+
         int ringerMode = ApplicationPreferences.prefRingerMode;
-//        Log.e("ActivateProfileHelper.setVolumes", "ringerMode="+ringerMode);
 
         int systemZenMode = getSystemZenMode(appContext/*, -1*/);
-//        Log.e("ActivateProfileHelper.setVolumes", "systemZenMode="+systemZenMode);
 
         if (forProfileActivation) {
             if (profile._volumeMuteSound) {
@@ -1342,10 +1360,13 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                 }
                                 try {
                                     //EventPreferencesVolumes.internalChange = true;
-                                    if (audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM) != profile.getVolumeSystemValue())
+                                    //if (systemSystemVolume != profile.getVolumeSystemValue())
                                         audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM /* 1 */, profile.getVolumeSystemValue(), AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                     //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_SYSTEM, profile.getVolumeSystemValue());
                                     //correctVolume0(audioManager);
+//                                    Log.e("ActivateProfileHelper.setVolumes", "notiifcations (1)="+audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION));
+//                                    Log.e("ActivateProfileHelper.setVolumes", "ringing (1)="+audioManager.getStreamVolume(AudioManager.STREAM_RING));
+//                                    Log.e("ActivateProfileHelper.setVolumes", "system (1)="+audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM));
                                 } catch (Exception e) {
                                     PPApplicationStatic.recordException(e);
                                 }
@@ -1355,10 +1376,11 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
 
                     boolean volumesSet = false;
                     //TelephonyManager telephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+//                    Log.e("ActivateProfileHelper.setVolumes", "merge="+ActivateProfileHelper.getMergedRingNotificationVolumes());
+//                    Log.e("ActivateProfileHelper.setVolumes", "unlink="+ApplicationPreferences.applicationUnlinkRingerNotificationVolumes);
                     if (/*(telephony != null) &&*/ ActivateProfileHelper.getMergedRingNotificationVolumes() && ApplicationPreferences.applicationUnlinkRingerNotificationVolumes) {
 
                         if ((!ringMuted) && (!notificationMuted)) {
-
                             //int callState = telephony.getCallState();
                             if ((linkUnlink == PhoneCallsListener.LINKMODE_UNLINK)/* ||
                             (callState == TelephonyManager.CALL_STATE_RINGING)*/) {
@@ -1368,15 +1390,17 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                 int volume = ApplicationPreferences.prefRingerVolume;
                                 if (volume != -999) {
                                     try {
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(1) STREAM_RING");
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_RING) != volume)
+                                        //if (systemRingVolume != volume)
                                             audioManager.setStreamVolume(AudioManager.STREAM_RING /* 2 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                         PlayRingingNotification.simulatingRingingCallActualRingingVolume = volume;
                                         //PhoneProfilesService.notificationVolume = volume;
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_RING, profile.getVolumeRingtoneValue());
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) != volume)
-                                            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION /* 5 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(1) STREAM_NOTIFICATION");
+                                        //if (systemNotificationVolume != volume)
+                                        //    audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION /* 5 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_NOTIFICATION, profile.getVolumeNotificationValue());
                                         //correctVolume0(audioManager);
                                         if (!profile.getVolumeNotificationChange())
@@ -1388,12 +1412,15 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                 volumesSet = true;
                             } else if (linkUnlink == PhoneCallsListener.LINKMODE_LINK) {
                                 // for separating ringing and notification
-                                // in not ringing state ringer and notification volume must by change
-                                int volume = ApplicationPreferences.prefRingerVolume;
+                                // in not ringing state notification vomume must be set as ringing
+                                // and notification volume must not be set
+                                //int volume = ApplicationPreferences.prefRingerVolume;
+                                int volume = ApplicationPreferences.prefNotificationVolume;
                                 if (volume != -999) {
                                     try {
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_RING) != volume)
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(2) STREAM_RING");
+                                        //if (systemRingVolume != volume)
                                             audioManager.setStreamVolume(AudioManager.STREAM_RING /* 2 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                         PlayRingingNotification.simulatingRingingCallActualRingingVolume = volume;
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_RING, profile.getVolumeRingtoneValue());
@@ -1403,27 +1430,35 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                         PPApplicationStatic.recordException(e);
                                     }
                                 }
+                                /*
                                 volume = ApplicationPreferences.prefNotificationVolume;
                                 if (volume != -999) {
                                     try {
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) != volume)
-                                            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION /* 5 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(2) STREAM_NOTIFICATION");
+                                        //if (systemNotificationVolume != volume)
+                                            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION  5, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                         //PhoneProfilesService.notificationVolume = volume;
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_NOTIFICATION, profile.getVolumeNotificationValue());
                                     } catch (Exception e) {
                                         PPApplicationStatic.recordException(e);
                                     }
                                 }
+                                */
                                 //correctVolume0(audioManager);
                                 volumesSet = true;
                             } else if ((linkUnlink == PhoneCallsListener.LINKMODE_NONE)/* ||
                                     (callState == TelephonyManager.CALL_STATE_IDLE)*/) {
-                                int volume = ApplicationPreferences.prefRingerVolume;
+                                // for separating ringing and notification
+                                // default: notification vomume must be set as ringing
+                                // and notification volume must not be set
+                                //int volume = ApplicationPreferences.prefRingerVolume;
+                                int volume = ApplicationPreferences.prefNotificationVolume;
                                 if (volume != -999) {
                                     try {
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_RING) != volume)
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(3) STREAM_RING");
+                                       // if (systemRingVolume != volume)
                                             audioManager.setStreamVolume(AudioManager.STREAM_RING /* 2 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                         PlayRingingNotification.simulatingRingingCallActualRingingVolume = volume;
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_RING, volume);
@@ -1434,12 +1469,14 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                         PPApplicationStatic.recordException(e);
                                     }
                                 }
+                                /*
                                 volume = ApplicationPreferences.prefNotificationVolume;
                                 if (volume != -999) {
                                     try {
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) != volume)
-                                            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION /* 5 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(3) STREAM_NOTIFICATION");
+                                        //if (systemNotificationVolume != volume)
+                                            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION  5, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                                         //PhoneProfilesService.notificationVolume = volume;
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_NOTIFICATION, volume);
                                         //correctVolume0(audioManager);
@@ -1447,21 +1484,48 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                         PPApplicationStatic.recordException(e);
                                     }
                                 }
+                                */
                                 volumesSet = true;
                             }
+//                            Log.e("ActivateProfileHelper.setVolumes", "notiifcations (3)="+audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION));
+//                            Log.e("ActivateProfileHelper.setVolumes", "ringing (3)="+audioManager.getStreamVolume(AudioManager.STREAM_RING));
+//                            Log.e("ActivateProfileHelper.setVolumes", "system (3)="+audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM));
                         }
                     }
+//                    Log.e("ActivateProfileHelper.setVolumes", "volumesSet="+volumesSet);
                     if (!volumesSet) {
-                        // reverted order for disabled unlink
-                        int volume;
                         if (!ActivateProfileHelper.getMergedRingNotificationVolumes()) {
+                            int volume;
+                            if (!ringMuted) {
+                                volume = ApplicationPreferences.prefRingerVolume;
+//                                Log.e("ActivateProfileHelper.setVolumes", "ringing volume="+volume);
+                                if (volume != -999) {
+                                    try {
+                                        //EventPreferencesVolumes.internalChange = true;
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(4) STREAM_RING");
+                                        //if (systemRingVolume != volume)
+//                                        Log.e("ActivateProfileHelper.setVolumes", "set ringong volume");
+                                        audioManager.setStreamVolume(AudioManager.STREAM_RING /* 2 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+                                        PlayRingingNotification.simulatingRingingCallActualRingingVolume = volume;
+                                        //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_RING, volume);
+                                        //correctVolume0(audioManager);
+                                    } catch (Exception e) {
+                                        PPApplicationStatic.recordException(e);
+                                    }
+                                }
+                            }
+//                            Log.e("ActivateProfileHelper.setVolumes", "not merged volumes");
                             if (!notificationMuted) {
                                 volume = ApplicationPreferences.prefNotificationVolume;
+//                                Log.e("ActivateProfileHelper.setVolumes", "notification volume="+volume);
                                 if (volume != -999) {
                                     try {
                                         //EventPreferencesVolumes.internalChange = true;
-                                        if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) != volume)
-                                            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION /* 5 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(4) STREAM_NOTIFICATION");
+                                        //if (systemNotificationVolume != volume) {
+//                                            Log.e("ActivateProfileHelper.setVolumes", "set notification volume");
+                                        audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION /* 5 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+                                        //}
                                         //PhoneProfilesService.notificationVolume = volume;
                                         //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_NOTIFICATION, volume);
                                         //correctVolume0(audioManager);
@@ -1470,22 +1534,30 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                                     }
                                 }
                             }
-                        }
-                        if (!ringMuted) {
-                            volume = ApplicationPreferences.prefRingerVolume;
-                            if (volume != -999) {
-                                try {
-                                    //EventPreferencesVolumes.internalChange = true;
-                                    if (audioManager.getStreamVolume(AudioManager.STREAM_RING) != volume)
+                        } else {
+                            int volume;
+                            if (!ringMuted) {
+                                volume = ApplicationPreferences.prefNotificationVolume;
+//                            Log.e("ActivateProfileHelper.setVolumes", "ringing volume="+volume);
+                                if (volume != -999) {
+                                    try {
+                                        //EventPreferencesVolumes.internalChange = true;
+//                                        Log.e("ActivateProfileHelper.setVolumes", "(4) STREAM_RING");
+                                        //if (systemRingVolume != volume)
+//                                        Log.e("ActivateProfileHelper.setVolumes", "set ringong volume");
                                         audioManager.setStreamVolume(AudioManager.STREAM_RING /* 2 */, volume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
-                                    PlayRingingNotification.simulatingRingingCallActualRingingVolume = volume;
-                                    //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_RING, volume);
-                                    //correctVolume0(audioManager);
-                                } catch (Exception e) {
-                                    PPApplicationStatic.recordException(e);
+                                        PlayRingingNotification.simulatingRingingCallActualRingingVolume = volume;
+                                        //Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_RING, volume);
+                                        //correctVolume0(audioManager);
+                                    } catch (Exception e) {
+                                        PPApplicationStatic.recordException(e);
+                                    }
                                 }
                             }
                         }
+//                        Log.e("ActivateProfileHelper.setVolumes", "notiifcations (2)="+audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION));
+//                        Log.e("ActivateProfileHelper.setVolumes", "ringing (2)="+audioManager.getStreamVolume(AudioManager.STREAM_RING));
+//                        Log.e("ActivateProfileHelper.setVolumes", "system (2)="+audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM));
                     }
                 }
             }
@@ -1526,7 +1598,9 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
                 boolean musicMuted = audioManager.isStreamMute(AudioManager.STREAM_MUSIC);
                 if (!musicMuted) {
                     if (profile.getVolumeMediaChange()) {
-                        setMediaVolume(appContext, audioManager, profile.getVolumeMediaValue(),
+                        setMediaVolume(appContext, audioManager,
+                                audioManager.getStreamVolume(AudioManager.STREAM_MUSIC),
+                                profile.getVolumeMediaValue(),
                                 profile._volumeMediaChangeDuringPlay, true);
                     }
                 }
@@ -1534,7 +1608,7 @@ private static void setVolumes(Context context, Profile profile, AudioManager au
         }
     }
 
-    static void setMediaVolume(Context context, AudioManager audioManager, int value,
+    static void setMediaVolume(Context context, AudioManager audioManager, int systemValue, int value,
                                boolean allowDuringMusicPlay, boolean setMediaVolumeChanged) {
 //        Log.e("ActivateProfileHelper.setMediaVolume", "isMusicActive="+audioManager.isMusicActive());
 
@@ -1548,7 +1622,7 @@ static void setMediaVolume(Context context, AudioManager audioManager, int value
             //if (PPApplication.deviceIsOnePlus)
             //    Settings.System.putInt(context.getContentResolver(), Settings.System.VOLUME_MUSIC, value);
             //else
-            if (audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) != value)
+            if (systemValue != value)
                 audioManager.setStreamVolume(AudioManager.STREAM_MUSIC /* 3 */, value, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
 //            Log.e("ActivateProfileHelper.setMediaVolume", "audioManager.setStreamVolume");
 
@@ -1566,8 +1640,8 @@ static void setMediaVolume(Context context, AudioManager audioManager, int value
                     if (Settings.Global.getInt(appContext.getContentResolver(),
                             SETTINGS_AUDIO_SAFE_VOLUME_STATE, -1) != 2)
                         Settings.Global.putInt(appContext.getContentResolver(), SETTINGS_AUDIO_SAFE_VOLUME_STATE, 2);
-                    if (audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) != value)
-                        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC /* 3 */, value, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+                    //if (systemValue != value)
+                    audioManager.setStreamVolume(AudioManager.STREAM_MUSIC /* 3 */, value, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                     G1OK = true;
 
                     if (setMediaVolumeChanged)
@@ -1589,8 +1663,8 @@ static void setMediaVolume(Context context, AudioManager audioManager, int value
                             //EventPreferencesVolumes.internalChange = true;
                             RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
                             RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_MEDIA_VOLUME);
-                            if (audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) != value)
-                                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC /* 3 */, value, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+                            //if (systemValue != value)
+                            audioManager.setStreamVolume(AudioManager.STREAM_MUSIC /* 3 */, value, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
 
                             if (setMediaVolumeChanged)
                                 PPApplication.volumesMediaVolumeChangeed = true;
@@ -1754,9 +1828,7 @@ private static void setVibrateWhenRinging(Context context, Profile profile, int
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, Settings.System.VIBRATE_WHEN_RINGING, String.valueOf(lValue));
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, SETTINGS_PREF_VIBRATE_IN_NORMAL, String.valueOf(lValue));
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, SETTINGS_PREF_VIBRATE_IN_SILENT, String.valueOf(lValue));
-                                }
-                                else
-                                if (PPApplication.deviceIsOnePlus) {
+                                } else if (PPApplication.deviceIsOnePlus) {
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, Settings.System.VIBRATE_WHEN_RINGING, String.valueOf(lValue));
                                     switch (lValue) {
                                         case 1:
@@ -1769,6 +1841,45 @@ private static void setVibrateWhenRinging(Context context, Profile profile, int
                                 } else {
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, Settings.System.VIBRATE_WHEN_RINGING, String.valueOf(lValue));
                                 }
+                            }
+                            else if (ShizukuUtils.hasShizukuPermission()) {
+                                synchronized (PPApplication.rootMutex) {
+                                    try {
+                                        String command1;
+                                        String command2 = "";
+                                        String command3 = "";
+                                        if (PPApplication.deviceIsXiaomi && PPApplication.romIsMIUI) {
+                                            command1 = COMMAND_SETTINGS_PUT_SYSTEM + Settings.System.VIBRATE_WHEN_RINGING + " " + lValue;
+                                            command2 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_VIBRATE_IN_NORMAL + " " + lValue;
+                                            command3 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_VIBRATE_IN_SILENT + " " + lValue;
+                                        }
+                                        else
+                                        if (PPApplication.deviceIsOnePlus) {
+                                            command1 = COMMAND_SETTINGS_PUT_SYSTEM + Settings.System.VIBRATE_WHEN_RINGING + " " + lValue;
+                                            command2 = "";
+                                            switch (lValue) {
+                                                case 1:
+                                                    command2 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_RING_VIBRATION_INTENSITY + " " + "2";
+                                                    break;
+                                                case 0:
+                                                    command2 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_RING_VIBRATION_INTENSITY + " " + "0";
+                                                    break;
+                                            }
+                                        } else {
+                                            command1 = COMMAND_SETTINGS_PUT_SYSTEM + Settings.System.VIBRATE_WHEN_RINGING + " " + lValue;
+                                            //if (PPApplication.isSELinuxEnforcing())
+                                            //	command1 = PPApplication.getSELinuxEnforceCommand(command1, Shell.ShellContext.SYSTEM_APP);
+                                        }
+                                        //if (!command1.isEmpty())
+                                        ShizukuUtils.executeCommand(command1);
+                                        if (!command2.isEmpty())
+                                            ShizukuUtils.executeCommand(command2);
+                                        if (!command3.isEmpty())
+                                            ShizukuUtils.executeCommand(command3);
+                                    } catch (Exception e) {
+                                        //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                    }
+                                }
                             } else {
                                 if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                         (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -1863,6 +1974,32 @@ private static void setVibrateNotification(Context context, Profile profile, int
                     } else {
                         putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, SETTINGS_PREF_NOTIFICATION_VIBRATION_INTENSITY, String.valueOf(lValue));
                     }
+                }
+                else if (ShizukuUtils.hasShizukuPermission()) {
+                    synchronized (PPApplication.rootMutex) {
+                        String command1;
+                        String command2 = "";
+                        if (PPApplication.deviceIsPixel) {
+                            if (lValue > 0) {
+                                command1 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_VIBRATE_ON + " 1";
+                                command2 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_NOTIFICATION_VIBRATION_INTENSITY + " " + lValue;
+                            } else {
+                                command1 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_NOTIFICATION_VIBRATION_INTENSITY + " " + lValue;
+                            }
+                        } else {
+                            command1 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_NOTIFICATION_VIBRATION_INTENSITY + " " + lValue;
+                            //if (PPApplication.isSELinuxEnforcing())
+                            //	command1 = PPApplication.getSELinuxEnforceCommand(command1, Shell.ShellContext.SYSTEM_APP);
+                        }
+
+                        try {
+                            ShizukuUtils.executeCommand(command1);
+                            if (!command2.isEmpty())
+                                ShizukuUtils.executeCommand(command2);
+                        } catch (Exception e) {
+                            //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                        }
+                    }
                 } else {
                     if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                             (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -1918,7 +2055,16 @@ private static void _setVibrationIntensity(Context context,
 
                         if (isPPPPutSettingsInstalled(appContext) > 0)
                             putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, parameterName, String.valueOf(value));
-                        else {
+                        else if (ShizukuUtils.hasShizukuPermission()) {
+                            synchronized (PPApplication.rootMutex) {
+                                String command1 = COMMAND_SETTINGS_PUT_SYSTEM + parameterName + " " + value;
+                                try {
+                                    ShizukuUtils.executeCommand(command1);
+                                } catch (Exception e) {
+                                    //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                }
+                            }
+                        } else {
 //                            PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper._setVibrationIntensity", "(1) PPApplication.rootMutex");
                             synchronized (PPApplication.rootMutex) {
                                 String command1;
@@ -1938,7 +2084,32 @@ private static void _setVibrationIntensity(Context context,
                     } else {
                         if (isPPPPutSettingsInstalled(appContext) > 0)
                             putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, parameterName, String.valueOf(value));
-                        else {
+                        else if (ShizukuUtils.hasShizukuPermission() && RootUtils.settingsBinaryExists(false)) {
+                            synchronized (PPApplication.rootMutex) {
+                                String command1;
+                                String command2 = "";
+                                if (PPApplication.deviceIsPixel) {
+                                    if (value > 0) {
+                                        command1 = COMMAND_SETTINGS_PUT_SYSTEM + SETTINGS_PREF_VIBRATE_ON + " 1";
+                                        command2 = COMMAND_SETTINGS_PUT_SYSTEM + parameterName + " " + value;
+                                    } else {
+                                        command1 = COMMAND_SETTINGS_PUT_SYSTEM + parameterName + " " + value;
+                                    }
+                                } else {
+                                    command1 = COMMAND_SETTINGS_PUT_SYSTEM + parameterName + " " + value;
+                                    //if (PPApplication.isSELinuxEnforcing())
+                                    //	command1 = PPApplication.getSELinuxEnforceCommand(command1, Shell.ShellContext.SYSTEM_APP);
+                                }
+
+                                try {
+                                    ShizukuUtils.executeCommand(command1);
+                                    if (!command2.isEmpty())
+                                        ShizukuUtils.executeCommand(command2);
+                                } catch (Exception e) {
+                                    //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                }
+                            }
+                        } else {
                             if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                     (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
 //                                PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper._setVibrationIntensity", "(2) PPApplication.rootMutex");
@@ -2757,6 +2928,16 @@ private static boolean setTones(Context context, Profile profile,
 
                                             if (isPPPPutSettingsInstalled(appContext) > 0) {
                                                 putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_NOTIFICATION_SIM1_SAMSUNG, uri.toString());
+                                            }
+                                            else if (ShizukuUtils.hasShizukuPermission()) {
+                                                synchronized (PPApplication.rootMutex) {
+                                                    String command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_NOTIFICATION_SIM1_SAMSUNG + " " + uri.toString();
+                                                    try {
+                                                        ShizukuUtils.executeCommand(command1);
+                                                    } catch (Exception e) {
+                                                        //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                                    }
+                                                }
                                             } else {
                                                 if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                                         (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -2788,6 +2969,16 @@ private static boolean setTones(Context context, Profile profile,
 
                                             if (isPPPPutSettingsInstalled(appContext) > 0) {
                                                 putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_NOTIFICATION_SIM1_HUAWEI, uri.toString());
+                                            }
+                                            else if (ShizukuUtils.hasShizukuPermission()) {
+                                                synchronized (PPApplication.rootMutex) {
+                                                    String command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_NOTIFICATION_SIM1_HUAWEI + " " + uri.toString();
+                                                    try {
+                                                        ShizukuUtils.executeCommand(command1);
+                                                    } catch (Exception e) {
+                                                        //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                                    }
+                                                }
                                             } else {
                                                 if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                                         (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -2859,6 +3050,16 @@ private static boolean setTones(Context context, Profile profile,
 
                                     if (isPPPPutSettingsInstalled(appContext) > 0) {
                                         putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_NOTIFICATION_SIM1_SAMSUNG, "");
+                                    }
+                                    else if (ShizukuUtils.hasShizukuPermission()) {
+                                        synchronized (PPApplication.rootMutex) {
+                                            String command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_NOTIFICATION_SIM1_SAMSUNG + " \"\"";
+                                            try {
+                                                ShizukuUtils.executeCommand(command1);
+                                            } catch (Exception e) {
+                                                //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                            }
+                                        }
                                     } else {
                                         if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                                 (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -2888,6 +3089,16 @@ private static boolean setTones(Context context, Profile profile,
 
                                     if (isPPPPutSettingsInstalled(appContext) > 0) {
                                         putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_NOTIFICATION_SIM1_HUAWEI, "");
+                                    }
+                                    else if (ShizukuUtils.hasShizukuPermission()) {
+                                        synchronized (PPApplication.rootMutex) {
+                                            String command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_NOTIFICATION_SIM1_HUAWEI + " \"\"";
+                                            try {
+                                                ShizukuUtils.executeCommand(command1);
+                                            } catch (Exception e) {
+                                                //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                            }
+                                        }
                                     } else {
                                         if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                                 (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -2974,6 +3185,16 @@ private static boolean setTones(Context context, Profile profile,
 
                                             if (isPPPPutSettingsInstalled(appContext) > 0) {
                                                 putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_NOTIFICATION_SIM2_SAMSUNG, uri.toString());
+                                            }
+                                            else if (ShizukuUtils.hasShizukuPermission()) {
+                                                synchronized (PPApplication.rootMutex) {
+                                                    String command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_NOTIFICATION_SIM2_SAMSUNG + " " + uri.toString();
+                                                    try {
+                                                        ShizukuUtils.executeCommand(command1);
+                                                    } catch (Exception e) {
+                                                        //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                                    }
+                                                }
                                             } else {
                                                 if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                                         (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -3080,8 +3301,18 @@ private static boolean setTones(Context context, Profile profile,
 
                                     //Settings.System.putString(context.getContentResolver(), "notification_sound_2", null);
 
-                                    if (isPPPPutSettingsInstalled(appContext) > 0)  {
+                                    if (isPPPPutSettingsInstalled(appContext) > 0) {
                                         putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_NOTIFICATION_SIM2_SAMSUNG, "");
+                                    }
+                                    else if (ShizukuUtils.hasShizukuPermission()) {
+                                        synchronized (PPApplication.rootMutex) {
+                                            String command1 = COMMAND_SETTINGS_PUT_SYSTEM+PREF_NOTIFICATION_SIM2_SAMSUNG + " \"\"";
+                                            try {
+                                                ShizukuUtils.executeCommand(command1);
+                                            } catch (Exception e) {
+                                                //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                            }
+                                        }
                                     } else {
                                         if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                                 (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -3176,9 +3407,24 @@ private static boolean setTones(Context context, Profile profile,
                             if (isPPPPutSettingsInstalled(appContext) > 0) {
                                 if (PPApplication.deviceIsXiaomi && PPApplication.romIsMIUI)
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_RINGTONE_FOLLOW_SIM1_XIAOMI, value);
-                                else
-                                if (PPApplication.deviceIsOnePlus)
+                                else if (PPApplication.deviceIsOnePlus)
                                     putSettingsParameter(context, PPPPS_SETTINGS_TYPE_SYSTEM, PREF_RINGTONE_FOLLOW_SIM1_ONEPLUS, value);
+                            }
+                            else if (ShizukuUtils.hasShizukuPermission()) {
+                                synchronized (PPApplication.rootMutex) {
+                                    String command1 = null;
+                                    if (PPApplication.deviceIsXiaomi && PPApplication.romIsMIUI)
+                                        command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_RINGTONE_FOLLOW_SIM1_XIAOMI + " " + value;
+                                    else if (PPApplication.deviceIsOnePlus)
+                                        command1 = COMMAND_SETTINGS_PUT_SYSTEM + PREF_RINGTONE_FOLLOW_SIM1_ONEPLUS + " " + value;
+                                    if (command1 != null) {
+                                        try {
+                                            ShizukuUtils.executeCommand(command1);
+                                        } catch (Exception e) {
+                                            //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                        }
+                                    }
+                                }
                             } else {
                                 if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                         (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
@@ -3325,14 +3571,24 @@ static void executeForVolumes(Profile _profile, final int linkUnlinkVolumes, fin
                             changeRingerModeForVolumeEqual0(profile, audioManager, appContext);
                             changeNotificationVolumeForVolumeEqual0(/*context,*/ profile);
 
-                            setSoundMode(appContext, profile, audioManager, /*systemZenMode,*/ forProfileActivation, executedProfileSharedPreferences);
+                            /*
+                            if ((Build.VERSION.SDK_INT >= 34) &&
+                                ((getSystemZenMode(appContext) == ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY) ||
+                                 ((profile._volumeRingerMode == Profile.RINGERMODE_ZENMODE) && (profile._volumeZenMode == Profile.ZENMODE_PRIORITY)))) {
+                                requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
+                                setVolumes(appContext, profile, audioManager, linkUnlink, forProfileActivation, true);
+                                setSoundMode(appContext, profile, audioManager, forProfileActivation, executedProfileSharedPreferences);
+                            } else {*/
+                                setSoundMode(appContext, profile, audioManager, forProfileActivation, executedProfileSharedPreferences);
+
+                                GlobalUtils.sleep(500);
 
-                            GlobalUtils.sleep(500);
+                                // get actual system zen mode (may be changed in setRingerMode())
+                                //int systemZenMode = getSystemZenMode(appContext/*, -1*/);
 
-                            // get actual system zen mode (may be changed in setRingerMode())
-                            //int systemZenMode = getSystemZenMode(appContext/*, -1*/);
+                                setVolumes(appContext, profile, audioManager, linkUnlink, forProfileActivation, true);
 
-                            setVolumes(appContext, profile, audioManager, /*systemZenMode,*/ linkUnlink, forProfileActivation, true);
+                            //}
                         }
                     } else {
 
@@ -3340,7 +3596,13 @@ static void executeForVolumes(Profile _profile, final int linkUnlinkVolumes, fin
 
                         //int systemZenMode = getSystemZenMode(appContext/*, -1*/);
 
-                        setVolumes(appContext, profile, audioManager, /*systemZenMode,*/ PhoneCallsListener.LINKMODE_NONE, forProfileActivation, false);
+                        /*if ((Build.VERSION.SDK_INT >= 34) &&
+                            (getSystemZenMode(appContext) == ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY)) {
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
+                            setVolumes(appContext, profile, audioManager, PhoneCallsListener.LINKMODE_NONE, forProfileActivation, false);
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
+                        } else*/
+                            setVolumes(appContext, profile, audioManager, PhoneCallsListener.LINKMODE_NONE, forProfileActivation, false);
                     }
 
                     PPExecutors.scheduleDisableRingerModeInternalChangeExecutor();
@@ -3391,7 +3653,16 @@ private static void setNotificationLed(Context context, final int value, SharedP
                         final String NOTIFICATION_LIGHT_PULSE = "notification_light_pulse";
                         if (isPPPPutSettingsInstalled(appContext) > 0)
                             putSettingsParameter(appContext, PPPPS_SETTINGS_TYPE_SYSTEM, NOTIFICATION_LIGHT_PULSE, String.valueOf(value));
-                        else {
+                        else if (ShizukuUtils.hasShizukuPermission()) {
+                            synchronized (PPApplication.rootMutex) {
+                                String command1 = COMMAND_SETTINGS_PUT_SYSTEM + NOTIFICATION_LIGHT_PULSE + " " + value;
+                                try {
+                                    ShizukuUtils.executeCommand(command1);
+                                } catch (Exception e) {
+                                    //Log.e("ActivateProfileHelper.setMobileData", Log.getStackTraceString(e));
+                                }
+                            }
+                        } else {
                             if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
                                     (RootUtils.isRooted(/*false*/) && RootUtils.settingsBinaryExists(false))) {
 //                                PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setNotificationLed", "PPApplication.rootMutex");
@@ -3663,15 +3934,15 @@ static int getSystemZenMode(Context context/*, int defaultValue*/) {
             int interruptionFilter = mNotificationManager.getCurrentInterruptionFilter();
             switch (interruptionFilter) {
                 case NotificationManager.INTERRUPTION_FILTER_ALARMS:
-                    return ActivateProfileHelper.ZENMODE_ALARMS;
+                    return ActivateProfileHelper.SYSTEM_ZENMODE_ALARMS;
                 case NotificationManager.INTERRUPTION_FILTER_NONE:
-                    return ActivateProfileHelper.ZENMODE_NONE;
+                    return ActivateProfileHelper.SYSTEM_ZENMODE_NONE;
                 case NotificationManager.INTERRUPTION_FILTER_PRIORITY:
-                    return ActivateProfileHelper.ZENMODE_PRIORITY;
+                    return ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY;
                 case NotificationManager.INTERRUPTION_FILTER_ALL:
                 case NotificationManager.INTERRUPTION_FILTER_UNKNOWN:
                 default:
-                    return ActivateProfileHelper.ZENMODE_ALL;
+                    return ActivateProfileHelper.SYSTEM_ZENMODE_ALL;
             }
         }
         return -1; //defaultValue;
@@ -3737,17 +4008,17 @@ static void requestInterruptionFilter(Context context, final int zenMode) {
                 //if (GlobalGUIRoutines.activityActionExists(android.provider.Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS, context)) {
                 int interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALL;
                 switch (zenMode) {
-                    case ZENMODE_ALL:
+                    case SYSTEM_ZENMODE_ALL:
                         //noinspection ConstantConditions
                         interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALL;
                         break;
-                    case ZENMODE_PRIORITY:
+                    case SYSTEM_ZENMODE_PRIORITY:
                         interruptionFilter = NotificationManager.INTERRUPTION_FILTER_PRIORITY;
                         break;
-                    case ZENMODE_NONE:
+                    case SYSTEM_ZENMODE_NONE:
                         interruptionFilter = NotificationManager.INTERRUPTION_FILTER_NONE;
                         break;
-                    case ZENMODE_ALARMS:
+                    case SYSTEM_ZENMODE_ALARMS:
                         interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALARMS;
                         break;
                 }
@@ -3763,6 +4034,160 @@ static void requestInterruptionFilter(Context context, final int zenMode) {
         PPApplication.soundModeExecutorPool.submit(runnable);
     }
 
+    private static void _changeImageWallpapers(Profile profile, String wallpaperUri, String lockScreenWallpaperUri, boolean fromFolder, Context appContext) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        WindowManager wm = (WindowManager) appContext.getSystemService(Context.WINDOW_SERVICE);
+        if (wm != null) {
+            Display display = wm.getDefaultDisplay();
+            display.getRealMetrics(displayMetrics);
+            int height = displayMetrics.heightPixels;
+            int width = displayMetrics.widthPixels;
+            if (appContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                //noinspection SuspiciousNameCombination
+                height = displayMetrics.widthPixels;
+                //noinspection SuspiciousNameCombination
+                width = displayMetrics.heightPixels;
+            }
+
+            // for lock screen no double width
+            if (profile._deviceWallpaperFor != 2)
+                width = width << 1; // best wallpaper width is twice screen width
+
+            if (fromFolder) {
+                Bitmap decodedSampleBitmap = BitmapManipulator.resampleBitmapUri(wallpaperUri, width, height, false, true, appContext);
+                if (decodedSampleBitmap != null) {
+                    // set wallpaper
+                    WallpaperManager wallpaperManager = WallpaperManager.getInstance(appContext);
+                    try {
+                        int flags = WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK;
+                        Rect visibleCropHint = null;
+                        if (profile._deviceWallpaperFor == 1)
+                            flags = WallpaperManager.FLAG_SYSTEM;
+                        if (profile._deviceWallpaperFor == 2) {
+                            flags = WallpaperManager.FLAG_LOCK;
+                            int left = 0;
+                            int right = decodedSampleBitmap.getWidth();
+                            if (decodedSampleBitmap.getWidth() > width) {
+                                left = (decodedSampleBitmap.getWidth() / 2) - (width / 2);
+                                right = (decodedSampleBitmap.getWidth() / 2) + (width / 2);
+                            }
+                            visibleCropHint = new Rect(left, 0, right, decodedSampleBitmap.getHeight());
+                        }
+                        wallpaperManager.setBitmap(decodedSampleBitmap, visibleCropHint, true, flags);
+                        decodedSampleBitmap.recycle();
+
+                        // this is required for "change random image from folder"
+                        PPApplicationStatic.setWallpaperChangeTime(appContext);
+                    } catch (IOException e) {
+                        PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
+                                null, profile._name, "");
+                        //Log.e("ActivateProfileHelper._changeImageWallpaper", Log.getStackTraceString(e));
+                        PPApplicationStatic.recordException(e);
+                        decodedSampleBitmap.recycle();
+                    } catch (Exception e) {
+                        PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
+                                null, profile._name, "");
+                        //PPApplicationStatic.recordException(e);
+                        decodedSampleBitmap.recycle();
+                    }
+                } else {
+                    PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
+                            null, profile._name, "");
+                }
+            } else {
+                Bitmap decodedSampleBitmapHome = null;
+                Bitmap decodedSampleBitmapLock = null;
+                if ((profile._deviceWallpaperFor == 0) || (profile._deviceWallpaperFor == 1))
+                    decodedSampleBitmapHome = BitmapManipulator.resampleBitmapUri(wallpaperUri, width, height, false, true, appContext);
+                if ((lockScreenWallpaperUri != null) && (!lockScreenWallpaperUri.isEmpty()) &&
+                        (!lockScreenWallpaperUri.equals("-")) &&
+                        (profile._deviceWallpaperFor == 0) || (profile._deviceWallpaperFor == 2))
+                    decodedSampleBitmapLock = BitmapManipulator.resampleBitmapUri(lockScreenWallpaperUri, width, height, false, true, appContext);
+
+                WallpaperManager wallpaperManager = WallpaperManager.getInstance(appContext);
+                try {
+                    if (profile._deviceWallpaperFor == 0) {
+                        // home+lock
+                        if ((decodedSampleBitmapHome != null)) {
+                            int flags;
+                            if (decodedSampleBitmapLock == null)
+                                flags = WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK;
+                            else
+                                flags = WallpaperManager.FLAG_SYSTEM;
+
+                            wallpaperManager.setBitmap(decodedSampleBitmapHome, null, true, flags);
+                        }
+                        if (decodedSampleBitmapLock != null) {
+                            int flags = WallpaperManager.FLAG_LOCK;
+                            int left = 0;
+                            int right = decodedSampleBitmapLock.getWidth();
+                            if (decodedSampleBitmapLock.getWidth() > width) {
+                                left = (decodedSampleBitmapLock.getWidth() / 2) - (width / 2);
+                                right = (decodedSampleBitmapLock.getWidth() / 2) + (width / 2);
+                            }
+                            Rect visibleCropHint = new Rect(left, 0, right, decodedSampleBitmapLock.getHeight());
+
+                            wallpaperManager.setBitmap(decodedSampleBitmapLock, visibleCropHint, true, flags);
+                        }
+                    }
+                    if (profile._deviceWallpaperFor == 1) {
+                        // home only
+                        if ((decodedSampleBitmapHome != null)) {
+                            int flags;
+                            flags = WallpaperManager.FLAG_SYSTEM;
+
+                            wallpaperManager.setBitmap(decodedSampleBitmapHome, null, true, flags);
+                        }
+                    }
+                    if (profile._deviceWallpaperFor == 2) {
+                        // lock only
+                        Bitmap decodedSampleBitmap = decodedSampleBitmapHome;
+                        if (decodedSampleBitmapLock != null)
+                            decodedSampleBitmap = decodedSampleBitmapLock;
+
+                        if (decodedSampleBitmap != null) {
+                            int flags = WallpaperManager.FLAG_LOCK;
+                            int left = 0;
+                            int right = decodedSampleBitmap.getWidth();
+                            if (decodedSampleBitmap.getWidth() > width) {
+                                left = (decodedSampleBitmap.getWidth() / 2) - (width / 2);
+                                right = (decodedSampleBitmap.getWidth() / 2) + (width / 2);
+                            }
+                            Rect visibleCropHint = new Rect(left, 0, right, decodedSampleBitmap.getHeight());
+
+                            wallpaperManager.setBitmap(decodedSampleBitmap, visibleCropHint, true, flags);
+                        }
+                    }
+
+                    if (decodedSampleBitmapHome != null)
+                        decodedSampleBitmapHome.recycle();
+                    if (decodedSampleBitmapLock != null)
+                        decodedSampleBitmapLock.recycle();
+
+                    // this is required for "change random image from folder"
+                    PPApplicationStatic.setWallpaperChangeTime(appContext);
+                } catch (IOException e) {
+                    PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
+                            null, profile._name, "");
+                    //Log.e("ActivateProfileHelper._changeImageWallpaper", Log.getStackTraceString(e));
+                    PPApplicationStatic.recordException(e);
+                    if (decodedSampleBitmapHome != null)
+                        decodedSampleBitmapHome.recycle();
+                    if (decodedSampleBitmapLock != null)
+                        decodedSampleBitmapLock.recycle();
+                } catch (Exception e) {
+                    PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
+                            null, profile._name, "");
+                    //PPApplicationStatic.recordException(e);
+                    if (decodedSampleBitmapHome != null)
+                        decodedSampleBitmapHome.recycle();
+                    if (decodedSampleBitmapLock != null)
+                        decodedSampleBitmapLock.recycle();
+                }
+            }
+        }
+    }
+
     private static void setSoundMode(Context context, Profile profile, AudioManager audioManager,
             /*int systemZenMode,*/ boolean forProfileActivation, SharedPreferences executedProfileSharedPreferences)
     {
@@ -3793,7 +4218,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                     synchronized (PPApplication.notUnlinkVolumesMutex) {
                         PPApplication.ringerModeNotUnlinkVolumes = false;
                     }
-                    requestInterruptionFilter(appContext, ZENMODE_ALL);
+                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
                     GlobalUtils.sleep(500);
                     setRingerMode(audioManager, AudioManager.RINGER_MODE_NORMAL);
                     setVibrateSettings(false, audioManager);
@@ -3807,7 +4232,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                     synchronized (PPApplication.notUnlinkVolumesMutex) {
                         PPApplication.ringerModeNotUnlinkVolumes = false;
                     }
-                    requestInterruptionFilter(appContext, ZENMODE_ALL);
+                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
                     GlobalUtils.sleep(500);
                     setRingerMode(audioManager, AudioManager.RINGER_MODE_NORMAL);
                     setVibrateSettings(true, audioManager);
@@ -3821,7 +4246,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                     synchronized (PPApplication.notUnlinkVolumesMutex) {
                         PPApplication.ringerModeNotUnlinkVolumes = false;
                     }
-                    requestInterruptionFilter(appContext, ZENMODE_ALL);
+                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
                     GlobalUtils.sleep(500);
                     setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                     setVibrateSettings(true, audioManager);
@@ -3839,7 +4264,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                         synchronized (PPApplication.notUnlinkVolumesMutex) {
                             PPApplication.ringerModeNotUnlinkVolumes = false;
                         }
-                        requestInterruptionFilter(appContext, ZENMODE_ALL);
+                        requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
                         GlobalUtils.sleep(500);
                         setRingerMode(audioManager, AudioManager.RINGER_MODE_SILENT);
                         setVibrateSettings(true, audioManager);
@@ -3852,7 +4277,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                         setRingerMode(audioManager, AudioManager.RINGER_MODE_NORMAL);
                         setVibrateSettings(false, audioManager);
                         GlobalUtils.sleep(500);
-                        requestInterruptionFilter(appContext, ZENMODE_ALARMS);
+                        requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALARMS);
                     }
 
                     // set it by profile
@@ -3869,7 +4294,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                             setRingerMode(audioManager, AudioManager.RINGER_MODE_NORMAL);
                             setVibrateSettings(false, audioManager);
                             GlobalUtils.sleep(500);
-                            requestInterruptionFilter(appContext, ZENMODE_ALL);
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
 
                             // set it by profile
                             setVibrateWhenRinging(appContext, profile, -1, executedProfileSharedPreferences);
@@ -3887,7 +4312,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                                 setRingerMode(audioManager, AudioManager.RINGER_MODE_SILENT);
                             setVibrateSettings(false, audioManager);
                             GlobalUtils.sleep(500);
-                            requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
 
                             // set it by profile
                             setVibrateWhenRinging(appContext, profile, -1, executedProfileSharedPreferences);
@@ -3901,7 +4326,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                             setRingerMode(audioManager, AudioManager.RINGER_MODE_SILENT);
                             setVibrateSettings(false, audioManager);
                             GlobalUtils.sleep(500);
-                            requestInterruptionFilter(appContext, ZENMODE_NONE);
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_NONE);
                             break;
                         case Profile.ZENMODE_ALL_AND_VIBRATE:
                             // this is as Sound mode = Vibrate
@@ -3911,7 +4336,7 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                                 PPApplication.ringerModeNotUnlinkVolumes = false;
                             }
 
-                            requestInterruptionFilter(appContext, ZENMODE_ALL);
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALL);
                             GlobalUtils.sleep(500);
                             setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                             setVibrateSettings(true, audioManager);
@@ -3929,18 +4354,18 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                             if (Build.VERSION.SDK_INT <= 28) {
                                 setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                                 //setVibrateSettings(true, audioManager);
-                                requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
+                                requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
                                 GlobalUtils.sleep(1000);
                                 setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                                 setVibrateSettings(true, audioManager);
-                                requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
+                                requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
                             }
                             else {
                                 if ((PPApplication.deviceIsSamsung && PPApplication.romIsGalaxy) ||
                                         (PPApplication.deviceIsHuawei && PPApplication.romIsEMUI) ||
                                         (PPApplication.deviceIsXiaomi && PPApplication.romIsMIUI) ||
                                         PPApplication.deviceIsRealme) {
-                                    requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
+                                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
                                     GlobalUtils.sleep(500);
                                     setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                                     setVibrateSettings(true, audioManager);
@@ -3951,213 +4376,59 @@ private static void setSoundMode(Context context, Profile profile, AudioManager
                                     setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                                     setVibrateSettings(true, audioManager);
                                     GlobalUtils.sleep(500);
-                                    requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
+                                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
                                 }
                                 else {
                                     /*} else if (Build.VERSION.SDK_INT >= 33) {
                                         // must be set 2x to keep vibraton
                                         setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
                                         GlobalUtils.sleep(500);
-                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
-
-                                        setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
-                                        setVibrateSettings(true, audioManager);
-                                        //PPApplication.sleep(500);
-                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
-                                    } else if (Build.VERSION.SDK_INT >= 31) {
-                                        // vibration is not possibe to set for Android 12+ :-(
-                                        setRingerMode(audioManager, AudioManager.RINGER_MODE_NORMAL);
-                                        setVibrateSettings(false, audioManager);
-                                        GlobalUtils.sleep(500);
-                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
-
-                                        // set it by profile
-                                        setVibrateWhenRinging(appContext, profile, -1, executedProfileSharedPreferences);
-                                        setVibrateNotification(appContext, profile, -1, executedProfileSharedPreferences);*/
-                                    //}  else {
-                                        // must be set 2x to keep vibraton
-                                        setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
-                                        GlobalUtils.sleep(500);
-                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
-
-                                        setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
-                                        setVibrateSettings(true, audioManager);
-                                        //PPApplication.sleep(500);
-                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
-                                    //}
-                                }
-                            }
-
-                            // force vbration
-                            setVibrateWhenRinging(appContext, null, 1, executedProfileSharedPreferences);
-                            setVibrateNotification(appContext, null, 1, executedProfileSharedPreferences);
-                            break;
-                        case Profile.ZENMODE_ALARMS:
-//                            PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setRingerMode", "(11) PPApplication.notUnlinkVolumesMutex");
-                            synchronized (PPApplication.notUnlinkVolumesMutex) {
-                                PPApplication.ringerModeNotUnlinkVolumes = false;
-                            }
-                            setRingerMode(audioManager, AudioManager.RINGER_MODE_SILENT);
-                            setVibrateSettings(false, audioManager);
-                            GlobalUtils.sleep(500);
-                            requestInterruptionFilter(appContext, ZENMODE_ALARMS);
-                            break;
-                    }
-                    break;
-            }
-        }
-    }
-
-    private static void _changeImageWallpapers(Profile profile, String wallpaperUri, String lockScreenWallpaperUri, boolean fromFolder, Context appContext) {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        WindowManager wm = (WindowManager) appContext.getSystemService(Context.WINDOW_SERVICE);
-        if (wm != null) {
-            Display display = wm.getDefaultDisplay();
-            display.getRealMetrics(displayMetrics);
-            int height = displayMetrics.heightPixels;
-            int width = displayMetrics.widthPixels;
-            if (appContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                //noinspection SuspiciousNameCombination
-                height = displayMetrics.widthPixels;
-                //noinspection SuspiciousNameCombination
-                width = displayMetrics.heightPixels;
-            }
-
-            // for lock screen no double width
-            if (profile._deviceWallpaperFor != 2)
-                width = width << 1; // best wallpaper width is twice screen width
-
-            if (fromFolder) {
-                Bitmap decodedSampleBitmap = BitmapManipulator.resampleBitmapUri(wallpaperUri, width, height, false, true, appContext);
-                if (decodedSampleBitmap != null) {
-                    // set wallpaper
-                    WallpaperManager wallpaperManager = WallpaperManager.getInstance(appContext);
-                    try {
-                        int flags = WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK;
-                        Rect visibleCropHint = null;
-                        if (profile._deviceWallpaperFor == 1)
-                            flags = WallpaperManager.FLAG_SYSTEM;
-                        if (profile._deviceWallpaperFor == 2) {
-                            flags = WallpaperManager.FLAG_LOCK;
-                            int left = 0;
-                            int right = decodedSampleBitmap.getWidth();
-                            if (decodedSampleBitmap.getWidth() > width) {
-                                left = (decodedSampleBitmap.getWidth() / 2) - (width / 2);
-                                right = (decodedSampleBitmap.getWidth() / 2) + (width / 2);
-                            }
-                            visibleCropHint = new Rect(left, 0, right, decodedSampleBitmap.getHeight());
-                        }
-                        wallpaperManager.setBitmap(decodedSampleBitmap, visibleCropHint, true, flags);
-                        decodedSampleBitmap.recycle();
-
-                        // this is required for "change random image from folder"
-                        PPApplicationStatic.setWallpaperChangeTime(appContext);
-                    } catch (IOException e) {
-                        PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
-                                null, profile._name, "");
-                        //Log.e("ActivateProfileHelper._changeImageWallpaper", Log.getStackTraceString(e));
-                        PPApplicationStatic.recordException(e);
-                        decodedSampleBitmap.recycle();
-                    } catch (Exception e) {
-                        PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
-                                null, profile._name, "");
-                        //PPApplicationStatic.recordException(e);
-                        decodedSampleBitmap.recycle();
-                    }
-                } else {
-                    PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
-                            null, profile._name, "");
-                }
-            } else {
-                Bitmap decodedSampleBitmapHome = null;
-                Bitmap decodedSampleBitmapLock = null;
-                if ((profile._deviceWallpaperFor == 0) || (profile._deviceWallpaperFor == 1))
-                    decodedSampleBitmapHome = BitmapManipulator.resampleBitmapUri(wallpaperUri, width, height, false, true, appContext);
-                if ((lockScreenWallpaperUri != null) && (!lockScreenWallpaperUri.isEmpty()) &&
-                        (!lockScreenWallpaperUri.equals("-")) &&
-                        (profile._deviceWallpaperFor == 0) || (profile._deviceWallpaperFor == 2))
-                    decodedSampleBitmapLock = BitmapManipulator.resampleBitmapUri(lockScreenWallpaperUri, width, height, false, true, appContext);
-
-                WallpaperManager wallpaperManager = WallpaperManager.getInstance(appContext);
-                try {
-                    if (profile._deviceWallpaperFor == 0) {
-                        // home+lock
-                        if ((decodedSampleBitmapHome != null)) {
-                            int flags;
-                            if (decodedSampleBitmapLock == null)
-                                flags = WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK;
-                            else
-                                flags = WallpaperManager.FLAG_SYSTEM;
-
-                            wallpaperManager.setBitmap(decodedSampleBitmapHome, null, true, flags);
-                        }
-                        if (decodedSampleBitmapLock != null) {
-                            int flags = WallpaperManager.FLAG_LOCK;
-                            int left = 0;
-                            int right = decodedSampleBitmapLock.getWidth();
-                            if (decodedSampleBitmapLock.getWidth() > width) {
-                                left = (decodedSampleBitmapLock.getWidth() / 2) - (width / 2);
-                                right = (decodedSampleBitmapLock.getWidth() / 2) + (width / 2);
-                            }
-                            Rect visibleCropHint = new Rect(left, 0, right, decodedSampleBitmapLock.getHeight());
-
-                            wallpaperManager.setBitmap(decodedSampleBitmapLock, visibleCropHint, true, flags);
-                        }
-                    }
-                    if (profile._deviceWallpaperFor == 1) {
-                        // home only
-                        if ((decodedSampleBitmapHome != null)) {
-                            int flags;
-                            flags = WallpaperManager.FLAG_SYSTEM;
+                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
 
-                            wallpaperManager.setBitmap(decodedSampleBitmapHome, null, true, flags);
-                        }
-                    }
-                    if (profile._deviceWallpaperFor == 2) {
-                        // lock only
-                        Bitmap decodedSampleBitmap = decodedSampleBitmapHome;
-                        if (decodedSampleBitmapLock != null)
-                            decodedSampleBitmap = decodedSampleBitmapLock;
+                                        setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
+                                        setVibrateSettings(true, audioManager);
+                                        //PPApplication.sleep(500);
+                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
+                                    } else if (Build.VERSION.SDK_INT >= 31) {
+                                        // vibration is not possibe to set for Android 12+ :-(
+                                        setRingerMode(audioManager, AudioManager.RINGER_MODE_NORMAL);
+                                        setVibrateSettings(false, audioManager);
+                                        GlobalUtils.sleep(500);
+                                        requestInterruptionFilter(appContext, ZENMODE_PRIORITY);
 
-                        if (decodedSampleBitmap != null) {
-                            int flags = WallpaperManager.FLAG_LOCK;
-                            int left = 0;
-                            int right = decodedSampleBitmap.getWidth();
-                            if (decodedSampleBitmap.getWidth() > width) {
-                                left = (decodedSampleBitmap.getWidth() / 2) - (width / 2);
-                                right = (decodedSampleBitmap.getWidth() / 2) + (width / 2);
+                                        // set it by profile
+                                        setVibrateWhenRinging(appContext, profile, -1, executedProfileSharedPreferences);
+                                        setVibrateNotification(appContext, profile, -1, executedProfileSharedPreferences);*/
+                                    //}  else {
+                                    // must be set 2x to keep vibraton
+                                    setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
+                                    GlobalUtils.sleep(500);
+                                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
+
+                                    setRingerMode(audioManager, AudioManager.RINGER_MODE_VIBRATE);
+                                    setVibrateSettings(true, audioManager);
+                                    //PPApplication.sleep(500);
+                                    requestInterruptionFilter(appContext, SYSTEM_ZENMODE_PRIORITY);
+                                    //}
+                                }
                             }
-                            Rect visibleCropHint = new Rect(left, 0, right, decodedSampleBitmap.getHeight());
 
-                            wallpaperManager.setBitmap(decodedSampleBitmap, visibleCropHint, true, flags);
-                        }
+                            // force vbration
+                            setVibrateWhenRinging(appContext, null, 1, executedProfileSharedPreferences);
+                            setVibrateNotification(appContext, null, 1, executedProfileSharedPreferences);
+                            break;
+                        case Profile.ZENMODE_ALARMS:
+//                            PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setRingerMode", "(11) PPApplication.notUnlinkVolumesMutex");
+                            synchronized (PPApplication.notUnlinkVolumesMutex) {
+                                PPApplication.ringerModeNotUnlinkVolumes = false;
+                            }
+                            setRingerMode(audioManager, AudioManager.RINGER_MODE_SILENT);
+                            setVibrateSettings(false, audioManager);
+                            GlobalUtils.sleep(500);
+                            requestInterruptionFilter(appContext, SYSTEM_ZENMODE_ALARMS);
+                            break;
                     }
-
-                    if (decodedSampleBitmapHome != null)
-                        decodedSampleBitmapHome.recycle();
-                    if (decodedSampleBitmapLock != null)
-                        decodedSampleBitmapLock.recycle();
-
-                    // this is required for "change random image from folder"
-                    PPApplicationStatic.setWallpaperChangeTime(appContext);
-                } catch (IOException e) {
-                    PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
-                            null, profile._name, "");
-                    //Log.e("ActivateProfileHelper._changeImageWallpaper", Log.getStackTraceString(e));
-                    PPApplicationStatic.recordException(e);
-                    if (decodedSampleBitmapHome != null)
-                        decodedSampleBitmapHome.recycle();
-                    if (decodedSampleBitmapLock != null)
-                        decodedSampleBitmapLock.recycle();
-                } catch (Exception e) {
-                    PPApplicationStatic.addActivityLog(appContext, PPApplication.ALTYPE_PROFILE_ERROR_SET_WALLPAPER,
-                            null, profile._name, "");
-                    //PPApplicationStatic.recordException(e);
-                    if (decodedSampleBitmapHome != null)
-                        decodedSampleBitmapHome.recycle();
-                    if (decodedSampleBitmapLock != null)
-                        decodedSampleBitmapLock.recycle();
-                }
+                    break;
             }
         }
     }
@@ -4665,7 +4936,7 @@ static void executeForInteractivePreferences(final Profile profile, final Contex
                         if (!ok) {
                             ok = true;
                             try {
-                                intent = new Intent(android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS);
+                                intent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);
                                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                 final ComponentName componentName = new ComponentName(StringConstants.PHONE_PACKAGE_NAME, SETTINGS_PHONE_CLASS_NAME);
                                 intent.setComponent(componentName);
@@ -4680,7 +4951,7 @@ static void executeForInteractivePreferences(final Profile profile, final Contex
                         }
                         if (!ok) {
                             try {
-                                intent = new Intent(android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS);
+                                intent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);
                                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                 appContext.startActivity(intent);
                                 //Log.e("ActivateProfileHelper.executeForInteractivePreferences", "(3)");
@@ -4702,7 +4973,7 @@ static void executeForInteractivePreferences(final Profile profile, final Contex
                                 intent = null;
                         }
                         if (!ok) {
-                            intent = new Intent(android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS);
+                            intent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);
                             intent.setComponent(new ComponentName(StringConstants.PHONE_PACKAGE_NAME, SETTINGS_PHONE_CLASS_NAME));
                             if (GlobalGUIRoutines.activityIntentExists(intent, appContext))
                                 ok = true;
@@ -4710,7 +4981,7 @@ static void executeForInteractivePreferences(final Profile profile, final Contex
                                 intent = null;
                         }
                         if (!ok) {
-                            intent = new Intent(android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS);
+                            intent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);
                             if (GlobalGUIRoutines.activityIntentExists(intent, appContext))
                                 ok = true;
                             else
@@ -4740,7 +5011,7 @@ static void executeForInteractivePreferences(final Profile profile, final Contex
                             PPApplicationStatic.recordException(e);
                         }
                     } else {
-                        Intent intent = new Intent(android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS);
+                        Intent intent = new Intent(Settings.ACTION_DATA_ROAMING_SETTINGS);
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         String title = appContext.getString(R.string.profile_activation_interactive_preference_notification_title) + " " + profile._name;
                         String text = appContext.getString(R.string.profile_activation_interactive_preference_notification_text) + " " +
@@ -6106,7 +6377,7 @@ private static void setAirplaneMode(Context context, boolean mode, boolean useAs
         if (!useAssistant) {
             boolean isRooted = RootUtils.isRooted(/*false*/);
             boolean settingsBinaryExists = RootUtils.settingsBinaryExists(false);
-            if (ShizukuUtils.hasShizukuPermission()) {
+            if (ShizukuUtils.hasShizukuPermission() && settingsBinaryExists) {
                 synchronized (PPApplication.rootMutex) {
                     if (Build.VERSION.SDK_INT <= 27) {
                         String command1;
@@ -6303,7 +6574,7 @@ static boolean isMobileData(Context context, int simCard)
     static boolean canSetMobileData(Context context)
     {
         Context appContext = context.getApplicationContext();
-        if (android.os.Build.VERSION.SDK_INT >= 28)
+        if (Build.VERSION.SDK_INT >= 28)
             return true;
         else
         {
@@ -6594,7 +6865,10 @@ static boolean telephonyServiceExists(String preference) {
                     break;
                 case Profile.PREF_PROFILE_DEVICE_ONOFF_SIM1:
                 case Profile.PREF_PROFILE_DEVICE_ONOFF_SIM2:
-                    transactionCode = PPApplication.rootMutex.transactionCode_setSubscriptionEnabled;
+                    if (Build.VERSION.SDK_INT < 31)
+                        transactionCode = PPApplication.rootMutex.transactionCode_setSubscriptionEnabled;
+                    else
+                        transactionCode = PPApplication.rootMutex.transactionCode_setSimPowerStateForSlot;
                     break;
             }
 
@@ -7399,6 +7673,8 @@ private static void setScreenDarkMode(Context appContext, final int value, Share
 
     private static void setDefaultSimCard(Context context, int subscriptionType, int simCard)
     {
+//        Log.e("ActivateProfileHelper.setDefaultSimCard", "(1) simCard="+simCard);
+
 //        switch (subscriptionType) {
 //            case SUBSCRIPTRION_VOICE:
 //                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionType=VOICE");
@@ -7417,7 +7693,7 @@ private static void setDefaultSimCard(Context context, int subscriptionType, int
         switch (subscriptionType) {
             case SUBSCRIPTRION_VOICE:
                 switch (simCard) {
-                    case 1: // ask for SIM - currently not supported
+                    case 1: // ask for SIM - supported only for calls
                         simCard = -1;
                         break;
                     case 2: // SIM 1
@@ -7433,6 +7709,7 @@ private static void setDefaultSimCard(Context context, int subscriptionType, int
             case SUBSCRIPTRION_DATA:
                 break;
         }
+//        Log.e("ActivateProfileHelper.setDefaultSimCard", "(2) simCard="+simCard);
 
         if (Permissions.checkPhone(context.getApplicationContext())) {
 //            Log.e("ActivateProfileHelper.setDefaultSimCard", "called hasSIMCard");
@@ -7447,162 +7724,302 @@ private static void setDefaultSimCard(Context context, int subscriptionType, int
                 boolean sim2Exists = hasSIMCardData.hasSIM2;
                 simExists = simExists && sim2Exists;
             }
+//            Log.e("ActivateProfileHelper.setDefaultSimCard", "(3) simExists="+simExists);
 
             if ((simCard == -1) || simExists) {
-                int defaultSubscriptionId = -1;
-                // Get the value of the "TRANSACTION_setDefaultSimCard" field.
-                int transactionCode = -1;
-                switch (subscriptionType) {
-                    case SUBSCRIPTRION_VOICE:
-                        defaultSubscriptionId = SubscriptionManager.getDefaultVoiceSubscriptionId();
-//                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "getTransactionCode for setDefaultVoiceSubId");
-                        transactionCode = PPApplication.rootMutex.transactionCode_setDefaultVoiceSubId;
-                        break;
-                    case SUBSCRIPTRION_SMS:
-                        defaultSubscriptionId = SubscriptionManager.getDefaultSmsSubscriptionId();
-//                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "getTransactionCode for setDefaultSmsSubId");
-                        transactionCode = PPApplication.rootMutex.transactionCode_setDefaultSmsSubId;
-                        break;
-                    case SUBSCRIPTRION_DATA:
-                        defaultSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
-//                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "getTransactionCode for setDefaultDataSubId");
-                        transactionCode = PPApplication.rootMutex.transactionCode_setDefaultDataSubId;
-                        break;
-                }
-//                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "defaultSubscriptionId=" + defaultSubscriptionId);
-//                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "transactionCode=" + transactionCode);
+                if (RootUtils.serviceBinaryExists(false) && RootUtils.settingsBinaryExists(false)) {
+                    int defaultSubscriptionId = -1;
+                    // Get the value of the "TRANSACTION_setDefaultSimCard" field.
+                    int transactionCode = -1;
+                    switch (subscriptionType) {
+                        case SUBSCRIPTRION_VOICE:
+                            defaultSubscriptionId = SubscriptionManager.getDefaultVoiceSubscriptionId();
+//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "getTransactionCode for setDefaultVoiceSubId");
+                            transactionCode = PPApplication.rootMutex.transactionCode_setDefaultVoiceSubId;
+                            break;
+                        case SUBSCRIPTRION_SMS:
+                            defaultSubscriptionId = SubscriptionManager.getDefaultSmsSubscriptionId();
+//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "getTransactionCode for setDefaultSmsSubId");
+                            transactionCode = PPApplication.rootMutex.transactionCode_setDefaultSmsSubId;
+                            break;
+                        case SUBSCRIPTRION_DATA:
+                            defaultSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
+//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "getTransactionCode for setDefaultDataSubId");
+                            transactionCode = PPApplication.rootMutex.transactionCode_setDefaultDataSubId;
+                            break;
+                    }
+//                    PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "defaultSubscriptionId=" + defaultSubscriptionId);
+//                    PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "transactionCode=" + transactionCode);
+//                    Log.e("ActivateProfileHelper.setDefaultSimCard", "(2) defaultSubscriptionId="+defaultSubscriptionId);
 
-                if (transactionCode != -1) {
+                    if (transactionCode != -1) {
 
-                    SubscriptionManager mSubscriptionManager = (SubscriptionManager) appContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
-                    //SubscriptionManager.from(appContext);
-                    if (mSubscriptionManager != null) {
-//                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "mSubscriptionManager != null");
-                        List<SubscriptionInfo> subscriptionList = null;
-                        try {
-                            // Loop through the subscription list i.e. SIM list.
-                            subscriptionList = mSubscriptionManager.getActiveSubscriptionInfoList();
-//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionList=" + subscriptionList);
-                        } catch (SecurityException e) {
-                            PPApplicationStatic.recordException(e);
-                        }
-                        if (subscriptionList != null) {
-//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionList.size()=" + subscriptionList.size());
-                            int size = subscriptionList.size();
-                            for (int i = 0; i < size; i++) {
-                                // Get the active subscription ID for a given SIM card.
-                                SubscriptionInfo subscriptionInfo = subscriptionList.get(i);
-//                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionInfo=" + subscriptionInfo);
-                                if (subscriptionInfo != null) {
-                                    int slotIndex = subscriptionInfo.getSimSlotIndex();
-                                    if ((simCard == -1) || (simCard == (slotIndex+1))) {
-                                        int subscriptionId = subscriptionInfo.getSubscriptionId();
-//                                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "(1) subscriptionId=" + subscriptionId);
-                                        if ((simCard == -1) || (subscriptionId != defaultSubscriptionId)) {
-                                            // do not call subscription change, when is aleredy set, this cause FC
-
-//                                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "(2) subscriptionId=" + subscriptionId);
-
-                                            // Galaxy S10 - root and Shizuku working. - Android 11
-                                            // Huawei - P40 Shizuku not working, root not tested - Android 10
-                                            // Xiaomi - Shizuku not working, roott not tested - Android 12
-//                                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "ShizukuUtils.shizukuAvailable()=" + ShizukuUtils.shizukuAvailable());
-//                                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "ShizukuUtils.hasShizukuPermission()=" + ShizukuUtils.hasShizukuPermission());
-                                            if (ShizukuUtils.hasShizukuPermission()) {
-                                                synchronized (PPApplication.rootMutex) {
-//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "****** Shizuku ******");
-                                                    String command1;
-                                                    if (simCard == -1)
-                                                        command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, 0);
-                                                    else
-                                                        command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId);
-
-                                                    String command2 = "";
-                                                    switch (subscriptionType) {
-                                                        case SUBSCRIPTRION_VOICE:
-                                                            if (simCard == -1)
-                                                                command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " 0";
-                                                            else
-                                                                command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " " + subscriptionId;
-                                                            break;
-                                                        case SUBSCRIPTRION_SMS:
-                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION + " " + subscriptionId;
-                                                            break;
-                                                        case SUBSCRIPTRION_DATA:
-                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
-                                                            break;
-                                                    }
+                        SubscriptionManager mSubscriptionManager = (SubscriptionManager) appContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+                        //SubscriptionManager.from(appContext);
+                        if (mSubscriptionManager != null) {
+//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "mSubscriptionManager != null");
+                            List<SubscriptionInfo> subscriptionList = null;
+                            try {
+                                // Loop through the subscription list i.e. SIM list.
+                                subscriptionList = mSubscriptionManager.getActiveSubscriptionInfoList();
+//                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionList=" + subscriptionList);
+                            } catch (SecurityException e) {
+                                PPApplicationStatic.recordException(e);
+                            }
+                            if (subscriptionList != null) {
+//                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionList.size()=" + subscriptionList.size());
+                                int size = subscriptionList.size();
+                                for (int i = 0; i < size; i++) {
+                                    // Get the active subscription ID for a given SIM card.
+                                    SubscriptionInfo subscriptionInfo = subscriptionList.get(i);
+//                                    PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionInfo=" + subscriptionInfo);
+                                    if (subscriptionInfo != null) {
+                                        int slotIndex = subscriptionInfo.getSimSlotIndex();
+                                        if ((simCard == -1) || (simCard == (slotIndex + 1))) {
+                                            int subscriptionId = subscriptionInfo.getSubscriptionId();
+//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "(1) subscriptionId=" + subscriptionId);
+//                                            Log.e("ActivateProfileHelper.setDefaultSimCard", "(3) subscriptionId="+subscriptionId);
+                                            //if ((simCard == -1) || (subscriptionId != defaultSubscriptionId)) {
+                                                // do not call subscription change, when is aleredy set, this cause FC
 
-//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "command1="+command1);
-//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "command2="+command2);
+//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "(2) subscriptionId=" + subscriptionId);
+//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "ShizukuUtils.shizukuAvailable()=" + ShizukuUtils.shizukuAvailable());
+//                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "ShizukuUtils.hasShizukuPermission()=" + ShizukuUtils.hasShizukuPermission());
 
-                                                    if ((command1 != null)/* && (!command2.isEmpty())*/) {
-                                                        try {
-                                                            ShizukuUtils.executeCommand(command2);
-                                                            ShizukuUtils.executeCommand(command1);
-                                                        } catch (Exception e) {
-//                                                        Log.e("ActivateProfileHelper.setDefaultSimCard", Log.getStackTraceString(e));
+                                                if ((Build.VERSION.SDK_INT >= 31) && //(subscriptionType == SUBSCRIPTRION_DATA) &&
+                                                        /*(simCard != -1) &&*/ RootUtils.settingsBinaryExists(false)) {
+
+                                                    //   https://www.reddit.com/r/tasker/comments/zdv9be/comment/iz4r1vj/?utm_medium=android_app&utm_source=share&context=3
+
+//                                                    Log.e("ActivateProfileHelper.setDefaultSimCard", "simCard=" + simCard);
+
+                                                    boolean _isAirplaneMode = isAirplaneMode(appContext);
+                                                    if (!_isAirplaneMode) {
+                                                        setAirplaneMode(context, true, false);
+                                                        //GlobalUtils.sleep(100);
+                                                    }
+                                                    boolean _isMobileData = false;
+                                                    if (subscriptionType == SUBSCRIPTRION_DATA) {
+                                                        _isMobileData = isMobileData(appContext, 0);
+                                                        if (_isMobileData) {
+                                                            setMobileData(context, false, 0);
+                                                            //GlobalUtils.sleep(100);
                                                         }
                                                     }
-                                                }
-                                            } else
-                                            if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
-                                                    RootUtils.isRooted(/*false*/)) {
-//                                                PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setDefaultSimCard", "PPApplication.rootMutex");
-                                                synchronized (PPApplication.rootMutex) {
-                                                    String command1;
-                                                    if (simCard == -1)
-                                                        command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, 0);
-                                                    else
-                                                        command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId);
-
-                                                    String command2 = "";
-                                                    switch (subscriptionType) {
-                                                        case SUBSCRIPTRION_VOICE:
-                                                            if (simCard == -1)
-                                                                command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " 0";
-                                                            else
-                                                                command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " " + subscriptionId;
-                                                            break;
-                                                        case SUBSCRIPTRION_SMS:
-                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION + " " + subscriptionId;
-                                                            break;
-                                                        case SUBSCRIPTRION_DATA:
-                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
-                                                            break;
+                                                    if (ShizukuUtils.hasShizukuPermission()) {
+                                                        synchronized (PPApplication.rootMutex) {
+                                                            String command1 = null;
+                                                            /*
+                                                            //String command2;
+                                                            //String command3;
+                                                            //String command4;
+                                                            if (simCard == 1) {
+                                                                command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                //command2 = COMMAND_SETTINGS_PUT_GLOBAL + "user_preferred_data_sub" + " " + subscriptionId;
+                                                                //command3 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data1" + " 1";
+                                                                //command4 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data2" + " 0";
+                                                            } else {
+                                                                command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                //command2 = COMMAND_SETTINGS_PUT_GLOBAL + "user_preferred_data_sub" + " " + subscriptionId;
+                                                                //command3 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data1" + " 0";
+                                                                //command4 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data2" + " 1";
+                                                            }
+                                                            */
+//                                                            Log.e("ActivateProfileHelper.setDefaultSimCard", "subscriptionType=" + subscriptionType);
+                                                            switch (subscriptionType) {
+                                                                case SUBSCRIPTRION_VOICE:
+//                                                                    Log.e("ActivateProfileHelper.setDefaultSimCard", "SUBSCRIPTRION_VOICE");
+                                                                    if (simCard == -1)
+                                                                        command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " 0";
+                                                                    else
+                                                                        command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                    break;
+                                                                case SUBSCRIPTRION_SMS:
+//                                                                    Log.e("ActivateProfileHelper.setDefaultSimCard", "SUBSCRIPTRION_SMS");
+                                                                    command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION + " " + subscriptionId;
+                                                                    break;
+                                                                case SUBSCRIPTRION_DATA:
+//                                                                    Log.e("ActivateProfileHelper.setDefaultSimCard", "SUBSCRIPTRION_DATA");
+                                                                    command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                    break;
+                                                                //default:
+                                                                //    command1 = null;
+                                                            }
+                                                            //noinspection ConstantValue
+                                                            if ((command1 != null)/* && (!command2.isEmpty())*/) {
+                                                                try {
+                                                                    ShizukuUtils.executeCommand(command1);
+                                                                    //ShizukuUtils.executeCommand(command2);
+                                                                    //ShizukuUtils.executeCommand(command3);
+                                                                    //ShizukuUtils.executeCommand(command4);
+                                                                } catch (Exception e) {
+    //                                                                    Log.e("ActivateProfileHelper.setDefaultSimCard", Log.getStackTraceString(e));
+                                                                }
+                                                            }
+                                                        }
+                                                    } else if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
+                                                            RootUtils.isRooted()) {
+                                                        synchronized (PPApplication.rootMutex) {
+                                                            //String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId);
+                                                            //String command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                            String command1 = null;
+                                                            /*
+                                                            //String command2;
+                                                            //String command3;
+                                                            //String command4;
+                                                            if (simCard == 1) {
+                                                                command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                //command2 = COMMAND_SETTINGS_PUT_GLOBAL + "user_preferred_data_sub" + " " + subscriptionId;
+                                                                //command3 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data1" + " 1";
+                                                                //command4 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data2" + " 0";
+                                                            } else {
+                                                                command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                //command2 = COMMAND_SETTINGS_PUT_GLOBAL + "user_preferred_data_sub" + " " + subscriptionId;
+                                                                //command3 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data1" + " 0";
+                                                                //command4 = COMMAND_SETTINGS_PUT_GLOBAL + "mobile_data2" + " 1";
+                                                            }
+                                                            */
+                                                            switch (subscriptionType) {
+                                                                case SUBSCRIPTRION_VOICE:
+                                                                    if (simCard == -1)
+                                                                        command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " 0";
+                                                                    else
+                                                                        command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                    break;
+                                                                case SUBSCRIPTRION_SMS:
+                                                                    command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION + " " + subscriptionId;
+                                                                    break;
+                                                                case SUBSCRIPTRION_DATA:
+                                                                    command1 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                    break;
+                                                                //default:
+                                                                //    command1 = null;
+                                                            }
+
+                                                            //noinspection ConstantValue
+                                                            if ((command1 != null)/* && (!command2.isEmpty())*/) {
+                                                                Command command = new Command(0, /*false,*/ command1/*, command2, command3, command4*/);
+                                                                try {
+                                                                    RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
+                                                                    RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_DEFAULT_SIM_CARD);
+                                                                } catch (Exception e) {
+                                                                    // com.stericson.rootshell.exceptions.RootDeniedException: Root Access Denied
+                                                                    //Log.e("ActivateProfileHelper.setDefaultSimCard", Log.getStackTraceString(e));
+                                                                    PPApplicationStatic.recordException(e);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                    if (_isMobileData) {
+                                                        //GlobalUtils.sleep(100);
+                                                        setMobileData(context, true, 0);
+                                                    }
+                                                    if (!_isAirplaneMode) {
+                                                        //GlobalUtils.sleep(100);
+                                                        setAirplaneMode(context, false, false);
                                                     }
 
-                                                    if ((command1 != null)/* && (!command2.isEmpty())*/) {
-                                                        Command command = new Command(0, /*false,*/ command2, command1);
-                                                        try {
-                                                            RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
-                                                            RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_DEFAULT_SIM_CARD);
-                                                        } catch (Exception e) {
-                                                            // com.stericson.rootshell.exceptions.RootDeniedException: Root Access Denied
-                                                            //Log.e("ActivateProfileHelper.setDefaultSimCard", Log.getStackTraceString(e));
-                                                            PPApplicationStatic.recordException(e);
+                                                } else {
+                                                    if ((simCard == -1) || (subscriptionId != defaultSubscriptionId)) {
+                                                        // do not call subscription change, when is aleredy set, this cause FC
+
+                                                        if (ShizukuUtils.hasShizukuPermission()) {
+                                                            synchronized (PPApplication.rootMutex) {
+//                                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "****** Shizuku ******");
+                                                                String command1;
+                                                                if (simCard == -1)
+                                                                    command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, 0);
+                                                                else
+                                                                    command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId);
+
+                                                                String command2 = "";
+                                                                switch (subscriptionType) {
+                                                                    case SUBSCRIPTRION_VOICE:
+                                                                        if (simCard == -1)
+                                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " 0";
+                                                                        else
+                                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                        break;
+                                                                    case SUBSCRIPTRION_SMS:
+                                                                        command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION + " " + subscriptionId;
+                                                                        break;
+                                                                    case SUBSCRIPTRION_DATA:
+                                                                        command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                        break;
+                                                                }
+
+//                                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "command1="+command1);
+//                                                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "command2="+command2);
+
+                                                                if ((command1 != null)/* && (!command2.isEmpty())*/) {
+                                                                    try {
+                                                                        ShizukuUtils.executeCommand(command2);
+                                                                        ShizukuUtils.executeCommand(command1);
+                                                                    } catch (Exception e) {
+//                                                                        Log.e("ActivateProfileHelper.setDefaultSimCard", Log.getStackTraceString(e));
+                                                                    }
+                                                                }
+                                                            }
+                                                        } else if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
+                                                                RootUtils.isRooted(/*false*/)) {
+//                                                            PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setDefaultSimCard", "PPApplication.rootMutex");
+                                                            synchronized (PPApplication.rootMutex) {
+                                                                String command1;
+                                                                if (simCard == -1)
+                                                                    command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, 0);
+                                                                else
+                                                                    command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId);
+
+                                                                String command2 = "";
+                                                                switch (subscriptionType) {
+                                                                    case SUBSCRIPTRION_VOICE:
+                                                                        if (simCard == -1)
+                                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " 0";
+                                                                        else
+                                                                            command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                        break;
+                                                                    case SUBSCRIPTRION_SMS:
+                                                                        command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_SMS_SUBSCRIPTION + " " + subscriptionId;
+                                                                        break;
+                                                                    case SUBSCRIPTRION_DATA:
+                                                                        command2 = COMMAND_SETTINGS_PUT_GLOBAL + Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION + " " + subscriptionId;
+                                                                        break;
+                                                                }
+
+                                                                if ((command1 != null)/* && (!command2.isEmpty())*/) {
+                                                                    Command command = new Command(0, /*false,*/ command2, command1);
+                                                                    try {
+                                                                        RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
+                                                                        RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_DEFAULT_SIM_CARD);
+                                                                    } catch (Exception e) {
+                                                                        // com.stericson.rootshell.exceptions.RootDeniedException: Root Access Denied
+                                                                        //Log.e("ActivateProfileHelper.setDefaultSimCard", Log.getStackTraceString(e));
+                                                                        PPApplicationStatic.recordException(e);
+                                                                    }
+                                                                }
+                                                            }
                                                         }
                                                     }
                                                 }
-                                            }
+                                            //}
                                         }
                                     }
-                                }
-//                                else
-//                                    PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionInfo == null");
+//                                    else
+//                                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionInfo == null");
 
-                                if (simCard == -1)
-                                    break;
+                                    if (simCard == -1)
+                                        break;
+                                }
                             }
+//                            else
+//                                PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionList == null");
                         }
 //                        else
-//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "subscriptionList == null");
+//                            PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "mSubscriptionManager == null");
                     }
 //                    else
-//                         PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "mSubscriptionManager == null");
+//                        PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "(transactionCode == -1) || (simCard == -1)");
                 }
-//                else
-//                    PPApplicationStatic.logE("[DEFAULT_SIM] ActivateProfileHelper.setDefaultSimCard", "(transactionCode == -1) || (simCard == -1)");
             }
         }
     }
@@ -7614,6 +8031,7 @@ private static void setSIMOnOff(Context context, boolean enable, int simCard)
 
         Context appContext = context.getApplicationContext();
 
+        /* if SIM is disabled, then GlobalUtils.hasSIMCard(contex; do not returns it
 //        Log.e("ActivateProfileHelper.setSIMOnOff", "called hasSIMCard");
         HasSIMCardData hasSIMCardData = GlobalUtils.hasSIMCard(context);
         boolean simExists = hasSIMCardData.simCount > 0;//hasSIMCardData.hasSIM1 || hasSIMCardData.hasSIM2;
@@ -7626,106 +8044,173 @@ private static void setSIMOnOff(Context context, boolean enable, int simCard)
             boolean sim2Exists = hasSIMCardData.hasSIM2;
             simExists = simExists && sim2Exists;
         }
+        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "simExists="+simExists);
+        */
 
-        if (simExists)
+        //noinspection ConstantValue
+        if (true /*simExists*/)
         {
             if (Permissions.checkPhone(context.getApplicationContext())) {
                 // Get the value of the "TRANSACTION_ssetSubscriptionEnabled" field.
-                int transactionCode = PPApplication.rootMutex.transactionCode_setSubscriptionEnabled;
-                    //transactionCode = PPApplication.getTransactionCode(String.valueOf(serviceManager), "setSubscriptionEnabled");
+                int transactionCode;
+                if (Build.VERSION.SDK_INT < 31) {
+                    transactionCode = PPApplication.rootMutex.transactionCode_setSubscriptionEnabled;
+//                    Log.e("ActivateProfileHelper.setSIMOnOff", "(1) transactionCode="+transactionCode);
+                }
+                else {
+                    transactionCode = PPApplication.rootMutex.transactionCode_setSimPowerStateForSlot;
+//                    Log.e("ActivateProfileHelper.setSIMOnOff", "(2) transactionCode="+transactionCode);
+                }
 
                 int state = enable ? 1 : 0;
 
                 if (transactionCode != -1) {
 //                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "transactionCode=" + transactionCode);
 
-                    SubscriptionManager mSubscriptionManager = (SubscriptionManager) appContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
-                    //SubscriptionManager.from(appContext);
-                    if (mSubscriptionManager != null) {
-//                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "mSubscriptionManager != null");
-                        List<SubscriptionInfo> subscriptionList = null;
-                        try {
-                            // Loop through the subscription list i.e. SIM list.
-                            subscriptionList = mSubscriptionManager.getActiveSubscriptionInfoList();
-//                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionList=" + subscriptionList);
-                        } catch (SecurityException e) {
-                            PPApplicationStatic.recordException(e);
+                    if (Build.VERSION.SDK_INT >= 31) {
+                        //https://www.reddit.com/r/tasker/comments/wt3hdp/disable_sim2_in_tasker/
+
+                        if (ShizukuUtils.hasShizukuPermission()) {
+                            synchronized (PPApplication.rootMutex) {
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "***** Shizuku *******");
+                                /*try {
+                                    //requires MODIFY_PHONE_STATE but is not possible to grant it with adb pm grant
+                                    mSubscriptionManager.setSubscriptionEnabled(subscriptionId, enable);
+                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "comand executed");
+                                } catch (Exception e) {
+                                    //Log.e("ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
+                                }*/
+                                String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_PHONE, transactionCode, simCard-1, state);
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
+//                                Log.e("ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
+                                if ((command1 != null)) {
+                                    try {
+                                        ShizukuUtils.executeCommand(command1);
+//                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "comand executed");
+                                    } catch (Exception e) {
+                                        //Log.e("ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
+                                    }
+                                }
+                            }
+                        } else if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
+                                       RootUtils.isRooted(/*false*/)) {
+//                            PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setSIMOnOff", "PPApplication.rootMutex");
+                            synchronized (PPApplication.rootMutex) {
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "***** root *******");
+                                String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_PHONE, transactionCode, simCard-1, state);
+
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
+                                if (command1 != null) {
+                                    Command command = new Command(0, /*false,*/ command1)/* {
+                                        @Override
+                                        public void commandOutput(int id, String line) {
+                                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command output -> line=" + line);
+                                            super.commandOutput(id, line);
+                                        }
+                                    }*/;
+                                    try {
+                                        RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
+                                        RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_SIM_ON_OFF);
+//                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command executed");
+                                    } catch (Exception e) {
+                                        // com.stericson.rootshell.exceptions.RootDeniedException: Root Access Denied
+//                                        Log.e("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
+                                        //PPApplicationStatic.recordException(e);
+                                    }
+                                }
+                            }
                         }
-                        if (subscriptionList != null) {
-//                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionList.size()=" + subscriptionList.size());
-                            int size = subscriptionList.size();
-                            for (int i = 0; i < size; i++) {
-                                // Get the active subscription ID for a given SIM card.
-                                SubscriptionInfo subscriptionInfo = subscriptionList.get(i);
-//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionInfo=" + subscriptionInfo);
-                                if (subscriptionInfo != null) {
-                                    int slotIndex = subscriptionInfo.getSimSlotIndex();
-                                    if (simCard == (slotIndex+1)) {
-                                        int subscriptionId = subscriptionInfo.getSubscriptionId();
-//                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionId=" + subscriptionId);
-
-                                        // not working root and Shizuku also in Galaxy S10 - Android 11
-                                        if (ShizukuUtils.hasShizukuPermission()) {
-                                            synchronized (PPApplication.rootMutex) {
-//                                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "***** Shizuku *******");
-                                                /*try {
-                                                    //requires MODIFY_PHONE_STATE but is not possible to grant it with adb pm grant
-                                                    mSubscriptionManager.setSubscriptionEnabled(subscriptionId, enable);
-                                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "comand executed");
-                                                } catch (Exception e) {
-                                                    //Log.e("ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
-                                                }*/
-                                                String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId, state);
-//                                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
-                                                if ((command1 != null)) {
-                                                    try {
-                                                        ShizukuUtils.executeCommand(command1);
-//                                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "comand executed");
+
+                    } else {
+                        SubscriptionManager mSubscriptionManager = (SubscriptionManager) appContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+                        //SubscriptionManager.from(appContext);
+                        if (mSubscriptionManager != null) {
+//                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "mSubscriptionManager != null");
+                            List<SubscriptionInfo> subscriptionList = null;
+                            try {
+                                // Loop through the subscription list i.e. SIM list.
+                                subscriptionList = mSubscriptionManager.getActiveSubscriptionInfoList();
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionList=" + subscriptionList);
+                            } catch (SecurityException e) {
+                                PPApplicationStatic.recordException(e);
+                            }
+                            if (subscriptionList != null) {
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionList.size()=" + subscriptionList.size());
+                                int size = subscriptionList.size();
+                                for (int i = 0; i < size; i++) {
+                                    // Get the active subscription ID for a given SIM card.
+                                    SubscriptionInfo subscriptionInfo = subscriptionList.get(i);
+//                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionInfo=" + subscriptionInfo);
+                                    if (subscriptionInfo != null) {
+                                        int slotIndex = subscriptionInfo.getSimSlotIndex();
+                                        if (simCard == (slotIndex + 1)) {
+                                            int subscriptionId = subscriptionInfo.getSubscriptionId();
+//                                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionId=" + subscriptionId);
+
+                                            // not working root and Shizuku also in Galaxy S10 - Android 11
+                                            if (ShizukuUtils.hasShizukuPermission()) {
+                                                synchronized (PPApplication.rootMutex) {
+//                                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "***** Shizuku *******");
+                                                    /*try {
+                                                        //requires MODIFY_PHONE_STATE but is not possible to grant it with adb pm grant
+                                                        mSubscriptionManager.setSubscriptionEnabled(subscriptionId, enable);
+                                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "comand executed");
                                                     } catch (Exception e) {
                                                         //Log.e("ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
+                                                    }*/
+                                                    String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId, state);
+//                                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
+//                                                    Log.e("ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
+                                                    if ((command1 != null)) {
+                                                        try {
+                                                            ShizukuUtils.executeCommand(command1);
+//                                                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "comand executed");
+                                                        } catch (Exception e) {
+                                                            //Log.e("ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
+                                                        }
                                                     }
                                                 }
-                                            }
-                                        } else
-                                        if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
-                                                RootUtils.isRooted(/*false*/)) {
-//                                            PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setSIMOnOff", "PPApplication.rootMutex");
-                                            synchronized (PPApplication.rootMutex) {
+                                            } else if ((!ApplicationPreferences.applicationNeverAskForGrantRoot) &&
+                                                    RootUtils.isRooted(/*false*/)) {
+//                                                PPApplicationStatic.logE("[SYNCHRONIZED] ActivateProfileHelper.setSIMOnOff", "PPApplication.rootMutex");
+                                                synchronized (PPApplication.rootMutex) {
 //                                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "***** root *******");
-                                                String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId, state);
-                                                //String command1 = PPApplication.getServiceCommand("phone", transactionCode, slotIndex, state);
-//                                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
-                                                if (command1 != null) {
-                                                    Command command = new Command(0, /*false,*/ command1)/* {
-                                                    @Override
-                                                    public void commandOutput(int id, String line) {
-                                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command output -> line=" + line);
-                                                        super.commandOutput(id, line);
-                                                    }
-                                                }*/;
-                                                    try {
-                                                        RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
-                                                        RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_SIM_ON_OFF);
-//                                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command executed");
-                                                    } catch (Exception e) {
-                                                        // com.stericson.rootshell.exceptions.RootDeniedException: Root Access Denied
-//                                                    Log.e("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
-                                                        //PPApplicationStatic.recordException(e);
+                                                    String command1 = RootUtils.getServiceCommand(COMMAND_SERVICE_ROOT_ISUB, transactionCode, subscriptionId, state);
+
+                                                    //String command1 = PPApplication.getServiceCommand("phone", transactionCode, slotIndex, state);
+//                                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command1=" + command1);
+                                                    if (command1 != null) {
+                                                        Command command = new Command(0, /*false,*/ command1)/* {
+                                                            @Override
+                                                            public void commandOutput(int id, String line) {
+                                                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command output -> line=" + line);
+                                                                super.commandOutput(id, line);
+                                                            }
+                                                        }*/;
+                                                        try {
+                                                            RootTools.getShell(true, Shell.ShellContext.SYSTEM_APP).add(command);
+                                                            RootUtils.commandWait(command, RootCommandWaitCalledFromConstants.ROOT_COMMAND_WAIT_CALLED_FROM_SET_SIM_ON_OFF);
+//                                                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "command executed");
+                                                        } catch (Exception e) {
+                                                            // com.stericson.rootshell.exceptions.RootDeniedException: Root Access Denied
+//                                                            Log.e("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", Log.getStackTraceString(e));
+                                                            //PPApplicationStatic.recordException(e);
+                                                        }
                                                     }
                                                 }
                                             }
                                         }
                                     }
+//                                    else
+//                                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionInfo == null");
                                 }
-//                                else
-//                                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionInfo == null");
                             }
+//                            else
+//                                PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionList == null");
                         }
 //                        else
-//                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "subscriptionList == null");
+//                            PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "mSubscriptionManager == null");
                     }
-//                    else
-//                        PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "mSubscriptionManager == null");
                 }
 //                else
 //                    PPApplicationStatic.logE("[DUAL_SIM] ActivateProfileHelper.setSIMOnOff", "transactionCode == -1");
@@ -8338,12 +8823,10 @@ static int isPPPPutSettingsInstalled(Context context) {
             if (installed) {
                 PackageInfo pInfo = packageManager.getPackageInfo(appInfo.packageName, 0);
                 return PPApplicationStatic.getVersionCode(pInfo);
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             // extender is not installed = package not found
             //Log.e("PPExtenderBroadcastReceiver.isExtenderInstalled", Log.getStackTraceString(e));
             //PPApplicationStatic.recordException(e);
@@ -8396,6 +8879,28 @@ static void putSettingsParameter(Context context,
             GlobalUtils.sleep(500);
         }
     }
+
+    /*
+    static int isShizukuInstalled(Context context) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            ApplicationInfo appInfo = packageManager.getApplicationInfo(PPApplication.PACKAGE_NAME_SHIZUKU, PackageManager.MATCH_ALL);
+            boolean installed = appInfo.enabled;
+            if (installed) {
+                PackageInfo pInfo = packageManager.getPackageInfo(appInfo.packageName, 0);
+                return PPApplicationStatic.getVersionCode(pInfo);
+            } else {
+                return 0;
+            }
+        } catch (Exception e) {
+            // extender is not installed = package not found
+            //Log.e("PPExtenderBroadcastReceiver.isExtenderInstalled", Log.getStackTraceString(e));
+            //PPApplicationStatic.recordException(e);
+            return 0;
+        }
+    }
+    */
+
 /*
     static void showError(Context context, String profileName, int parameterType) {
         if ((context == null) || (profileName == null))
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatedProfileEventBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatedProfileEventBroadcastReceiver.java
index 22517ed5cc..33cb21018e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatedProfileEventBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatedProfileEventBroadcastReceiver.java
@@ -54,7 +54,8 @@ private void doWork(long _profileId, Context context) {
                             DatabaseHandler databaseHandler = DatabaseHandler.getInstance(appContext);
                             for (Event _event : dataWrapper.eventList) {
                                 if ((_event._eventPreferencesActivatedProfile._enabled) && (_event.getStatus() != Event.ESTATUS_STOP)) {
-                                    if (_event._eventPreferencesActivatedProfile.isRunnable(appContext)) {
+                                    if (_event._eventPreferencesActivatedProfile.isRunnable(appContext) &&
+                                        _event._eventPreferencesActivatedProfile.isAllConfigured(appContext)) {
                                         int oldRunning = _event._eventPreferencesActivatedProfile._running;
 
                                         long startProfile = _event._eventPreferencesActivatedProfile._startProfile;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorActivity.java
index 50391457f4..f2aed29379 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorActivity.java
@@ -339,6 +339,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] ActivatorActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             //return true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorListFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorListFragment.java
index e908bcc607..054ac78c97 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorListFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ActivatorListFragment.java
@@ -558,6 +558,7 @@ private void activateProfile(Profile profile)
             else
             if (!ProfileStatic.isRedTextNotificationRequired(profile, false, activityDataWrapper.context)) {
                 PPApplication.showToastForProfileActivation = true;
+//                Log.e("ActivatorListFragment.activateProfile", "xxxxx");
                 activityDataWrapper.activateProfile(profile._id, PPApplication.STARTUP_SOURCE_ACTIVATOR, getActivity(), false);
             }
             else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ApplicationPreferences.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ApplicationPreferences.java
index f1dc97e008..e805875e37 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ApplicationPreferences.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ApplicationPreferences.java
@@ -95,7 +95,13 @@ class ApplicationPreferences {
     static volatile boolean notificationPrefIndicator;
     static volatile String notificationPrefIndicatorLightness;
     //static volatile String applicationHomeLauncher;
-    static volatile String applicationWidgetLauncher;
+
+    //static volatile String applicationWidgetLauncher;
+    static volatile String applicationWidgetIconLauncher;
+    static volatile String applicationWidgetOneRowLauncher;
+    static volatile String applicationWidgetListLauncher;
+    static volatile String applicationWidgetDashClockLauncher;
+
     static volatile String applicationNotificationLauncher;
     static volatile int applicationEventWifiScanInterval;
     static volatile long applicationDefaultProfile;
@@ -396,7 +402,13 @@ class ApplicationPreferences {
     static final String PREF_NOTIFICATION_PREF_INDICATOR = "notificationPrefIndicator";
     static final String PREF_NOTIFICATION_PREF_INDICATOR_LIGHTNESS = "notificationPrefIndicatorLightness";
     //static final String PREF_APPLICATION_HOME_LAUNCHER = "applicationHomeLauncher";
+
     static final String PREF_APPLICATION_WIDGET_LAUNCHER = "applicationWidgetLauncher";
+    static final String PREF_APPLICATION_WIDGET_ICON_LAUNCHER = "applicationWidgetIconLauncher";
+    static final String PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER = "applicationWidgetOneRowLauncher";
+    static final String PREF_APPLICATION_WIDGET_LIST_LAUNCHER = "applicationWidgetListLauncher";
+    static final String PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER = "applicationWidgetDashClockLauncher";
+
     static final String PREF_APPLICATION_NOTIFICATION_LAUNCHER = "applicationNotificationLauncher";
     static final String PREF_APPLICATION_EVENT_WIFI_SCAN_INTERVAL = "applicationEventWifiScanInterval";
     static final String PREF_APPLICATION_DEFAULT_PROFILE = "applicationBackgroundProfile";
@@ -608,6 +620,7 @@ class ApplicationPreferences {
     static final String PREF_APPLICATION_EVENT_WIFI_SCAN_IN_TIME_MULTIPLY_TO = "applicationEventWifiScanInTimeMultiplyTo";
 
     static final String PREF_QUICK_TILE_PROFILE_ID = "quickTileProfileId";
+    static final String PREF_DYNAMIC_SHORTCUT_PROFILE_ID = "dynamicShortcutProfileId";
 
     @CheckResult
     static SharedPreferences getSharedPreferences(Context context) {
@@ -968,8 +981,24 @@ static void notificationPrefIndicatorLightness(Context context) {
 //    }
 
     static final String PREF_APPLICATION_WIDGET_LAUNCHER_DEFAULT_VALUE = "activator";
-    static void applicationWidgetLauncher(Context context) {
-        applicationWidgetLauncher = getSharedPreferences(context).getString(PREF_APPLICATION_WIDGET_LAUNCHER, PREF_APPLICATION_WIDGET_LAUNCHER_DEFAULT_VALUE);
+//    static void applicationWidgetLauncher(Context context) {
+//        applicationWidgetLauncher = getSharedPreferences(context).getString(PREF_APPLICATION_WIDGET_LAUNCHER, PREF_APPLICATION_WIDGET_LAUNCHER_DEFAULT_VALUE);
+//    }
+    static final String PREF_APPLICATION_WIDGET_ICON_LAUNCHER_DEFAULT_VALUE = "activator";
+    static void applicationIconWidgetLauncher(Context context) {
+        applicationWidgetIconLauncher = getSharedPreferences(context).getString(PREF_APPLICATION_WIDGET_ICON_LAUNCHER, PREF_APPLICATION_WIDGET_ICON_LAUNCHER_DEFAULT_VALUE);
+    }
+    static final String PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER_DEFAULT_VALUE = "activator";
+    static void applicationOneRowWidgetLauncher(Context context) {
+        applicationWidgetOneRowLauncher = getSharedPreferences(context).getString(PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER, PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER_DEFAULT_VALUE);
+    }
+    static final String PREF_APPLICATION_WIDGET_LIST_LAUNCHER_DEFAULT_VALUE = "activator";
+    static void applicationListWidgetLauncher(Context context) {
+        applicationWidgetListLauncher = getSharedPreferences(context).getString(PREF_APPLICATION_WIDGET_LIST_LAUNCHER, PREF_APPLICATION_WIDGET_LIST_LAUNCHER_DEFAULT_VALUE);
+    }
+    static final String PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER_DEFAULT_VALUE = "activator";
+    static void applicationDashClockWidgetLauncher(Context context) {
+        applicationWidgetDashClockLauncher = getSharedPreferences(context).getString(PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER, PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER_DEFAULT_VALUE);
     }
 
     static final String PREF_APPLICATION_NOTIFICATION_LAUNCHER_DEFAULT_VALUE = "activator";
@@ -2397,4 +2426,15 @@ static void setQuickTileProfileId(Context context, int tile, long profileId) {
         editor.apply();
     }
 
+    static long getDynamicShortcutProfileId(Context context, int shortcut) {
+        SharedPreferences _preferences = getSharedPreferences(context);
+        return _preferences.getLong(PREF_DYNAMIC_SHORTCUT_PROFILE_ID + "_" + shortcut, 0);
+    }
+
+    static void setDynamicShortcutProfileId(Context context, int shortcut, long profileId) {
+        SharedPreferences.Editor editor = ApplicationPreferences.getEditor(context);
+        editor.putLong(PREF_DYNAMIC_SHORTCUT_PROFILE_ID + "_" + shortcut, profileId);
+        editor.apply();
+    }
+
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BackgroundActivateProfileActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BackgroundActivateProfileActivity.java
index 2c5beaeba7..435d08a5dd 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BackgroundActivateProfileActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BackgroundActivateProfileActivity.java
@@ -88,6 +88,10 @@ private void activateProfile() {
         if ((startupSource == PPApplication.STARTUP_SOURCE_WIDGET) ||
                 (startupSource == PPApplication.STARTUP_SOURCE_SHORTCUT) ||
                 (startupSource == PPApplication.STARTUP_SOURCE_QUICK_TILE)) {
+
+            // this must be called, because is required to be set DataWrapper.profileListFilled
+            dataWrapper.fillProfileList(false, false);
+
             if (profile_id == Profile.RESTART_EVENTS_PROFILE_ID) {
                 //if (Event.getGlobalEventsRunning()) {
                 // set theme and language for dialog alert ;-)
@@ -190,6 +194,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] ActivatorActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             return true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BitmapManipulator.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BitmapManipulator.java
index 194b187c46..cb9aba0fe3 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BitmapManipulator.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BitmapManipulator.java
@@ -27,6 +27,10 @@ class BitmapManipulator {
 
     static final int ICON_BITMAP_SIZE_MULTIPLIER = 4;
 
+    private BitmapManipulator() {
+        // private constructor to prevent instantiation
+    }
+
     /** @noinspection ControlFlowStatementWithoutBraces, BlockingMethodInNonBlockingContext */
     static Bitmap resampleBitmapUri(String bitmapUri, int width, int height, boolean checkSize, boolean checkOrientation, Context context) {
         if (bitmapUri == null)
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BootUpReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BootUpReceiver.java
index 44ddffe4d4..2a148719e0 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BootUpReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BootUpReceiver.java
@@ -86,6 +86,7 @@ public void onReceive(Context context, Intent intent) {
                                 serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, true);
                                 serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
                                 serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+                                serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //                                PPApplicationStatic.logE("[START_PP_SERVICE] BootUpReceiver.onReceive", "xxx");
                                 PPApplicationStatic.startPPService(appContext, serviceIntent, true);
                             } else {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BrightnessLookup.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BrightnessLookup.java
index 720ba32a62..1e709d4bf9 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BrightnessLookup.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/BrightnessLookup.java
@@ -2,6 +2,10 @@
 
 class BrightnessLookup {
 
+    private BrightnessLookup() {
+        // private constructor to prevent instantiation
+    }
+
 /*
     // https://stackoverflow.com/questions/73220966/how-to-get-the-brightness-percentage-in-android
 
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckCriticalPPPReleasesBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckCriticalPPPReleasesBroadcastReceiver.java
index b7400c0200..eac7a8f92d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckCriticalPPPReleasesBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckCriticalPPPReleasesBroadcastReceiver.java
@@ -199,7 +199,7 @@ static void doWork(final Context appContext) {
                                 // because from Android 13 is required to install apk from app stores
 
                                 RequestQueue queueIzzyRepo = Volley.newRequestQueue(appContext);
-                                String izzyRepoURL = PPApplication.DROIDIFY_PPP_LATEST_APK_RELEASE_URL_BEGIN;
+                                String izzyRepoURL = PPApplication.IZZY_PPP_LATEST_APK_RELEASE_URL_BEGIN;
                                 izzyRepoURL = izzyRepoURL + pppReleaseData.versionCodeInReleases + ".apk";
 //                                PPApplicationStatic.logE("CheckCriticalPPPReleasesBroadcastReceiver.doWork", "izzyRepoURL=" + izzyRepoURL);
 //                                Log.e("CheckCriticalPPPReleasesBroadcastReceiver.doWork", "izzyRepoURL=" + izzyRepoURL);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckLatestPPPPSReleasesBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckLatestPPPPSReleasesBroadcastReceiver.java
index dbcb0c4065..f7c1707da5 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckLatestPPPPSReleasesBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckLatestPPPPSReleasesBroadcastReceiver.java
@@ -166,13 +166,13 @@ static void doWork(final Context appContext) {
                 // but for Android 14 is required to istall with adb command
 
                 RequestQueue queueIzzyRepo = Volley.newRequestQueue(appContext);
-                String izzyRepoURL = PPApplication.DROIDIFY_PPPPS_LATEST_APK_RELEASE_URL_BEGIN;
+                String izzyRepoURL = PPApplication.IZZY_PPPPS_LATEST_APK_RELEASE_URL_BEGIN;
                 izzyRepoURL = izzyRepoURL + PPApplication.VERSION_CODE_PPPPS_LATEST + ".apk";
 //                Log.e("CheckLatestPPPPSReleasesBroadcastReceiver.doWork", "izzyRepoURL=" + izzyRepoURL);
                 StringRequest stringRequestIzzyRepo = new StringRequest(Request.Method.GET,
                         izzyRepoURL,
                         response1 -> {
-                            if (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_LATEST) {
+                            if (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_REQUIRED) {
                                 // latest exists in IzzyOnDroid, but is not installed
 //                                Log.e("CheckLatestPPPPSReleasesBroadcastReceiver.doWork", "latest NOT installed - xxxxxxxxxxxxxxxx");
                                 try {
@@ -200,7 +200,7 @@ static void doWork(final Context appContext) {
                 queueIzzyRepo.add(stringRequestIzzyRepo);
 
             } else {
-                if (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_LATEST)
+                if (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_REQUIRED)
                     // latest is not installed
                     showNotification(appContext);
             }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesActivity.java
index 3503361966..52dc36a1a9 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesActivity.java
@@ -161,6 +161,8 @@ private void showDialog(final Activity activity, int store) {
         //boolean galaxyStoreInstalled = (intent != null);
         intent = packageManager.getLaunchIntentForPackage(PPApplication.HUAWEI_APPGALLERY_PACKAGE_NAME);
         boolean appGalleryInstalled = (intent != null);
+        intent = packageManager.getLaunchIntentForPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+        boolean neostoreInstalled = (intent != null);
 
         boolean displayed = false;
 
@@ -206,6 +208,11 @@ private void showDialog(final Activity activity, int store) {
             checkInDroidIfy(activity, false);
             displayed = true;
         }
+        else
+        if (store == R.id.menu_check_in_neostore) {
+            checkInNeoStore(activity);
+            displayed = true;
+        }
 
         if (!displayed) {
             if (store == -1) {
@@ -223,6 +230,8 @@ private void showDialog(final Activity activity, int store) {
 //                        checkInAmazonAppstore(activity);
                     else if (droidifyInstalled)
                         checkInDroidIfy(activity, false);
+                    else if (neostoreInstalled)
+                        checkInNeoStore(activity);
                     else if (fdroidInstalled)
                         checkInFDroid(activity);
                     else {
@@ -377,20 +386,61 @@ public void onClick(@NonNull View textView) {
         if (!refreshOpenedDialog) {
             dialogBuilder.setPositiveButton(buttonText, (dialog, which) -> {
                 String url;
-                if (newVersionDataExists)
+                if (newVersionDataExists) {
                     url = PPApplication.GITHUB_PPP_DOWNLOAD_URL;
                     //url = PPApplication.GITHUB_PPP_DOWNLOAD_URL_1 + newVersionName + PPApplication.GITHUB_PPP_DOWNLOAD_URL_2;
-                else
+
+                    //if (PPApplication.deviceIsHuawei && PPApplication.romIsEMUI) {
+                        Intent i = new Intent(Intent.ACTION_VIEW);
+                        i.setData(Uri.parse(url));
+                        i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                        try {
+                            activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                        } catch (Exception e) {
+                            PPApplicationStatic.recordException(e);
+                        }
+                        activity.finish();
+                    /*} else {
+                        try {
+                            String textToast = activity.getString(R.string.downloading_toast_text);
+                            PPApplication.showToast(activity.getApplicationContext(), textToast, Toast.LENGTH_LONG);
+
+                            Uri Download_Uri = Uri.parse(url);
+                            DownloadManager.Request request = new DownloadManager.Request(Download_Uri);
+
+                            //Restrict the types of networks over which this download may proceed.
+                            request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE);
+                            //Set whether this download may proceed over a roaming connection.
+                            request.setAllowedOverRoaming(false);
+                            //Set the title of this download, to be displayed in notifications (if enabled).
+                            request.setTitle(activity.getString(R.string.download_PPP_title));
+                            //Set a description of this download, to be displayed in notifications (if enabled)
+                            request.setDescription(activity.getString(R.string.downloading_file_description));
+                            //Set the local destination for the downloaded file to a path within the application's external files directory
+                            request.setDestinationInExternalPublicDir(DIRECTORY_DOWNLOADS, "PhoneProfilesPlus.apk");
+                            //request.allowScanningByMediaScanner();
+                            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                            //Enqueue a new download and same the referenceId
+                            DownloadManager downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
+                            DownloadCompletedBroadcastReceiver.downloadReferencePPP = downloadManager.enqueue(request);
+                        } catch (Exception e) {
+                            PPApplicationStatic.recordException(e);
+                        }
+                        activity.finish();
+                    }*/
+                }
+                else {
                     url = PPApplication.GITHUB_PPP_RELEASES_URL;
 
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse(url));
-                try {
-                    activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
-                } catch (Exception e) {
-                    PPApplicationStatic.recordException(e);
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse(url));
+                    try {
+                        activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                    }
+                    activity.finish();
                 }
-                activity.finish();
             });
             dialogBuilder.setNegativeButton(android.R.string.cancel, null);
             dialogBuilder.setOnCancelListener(dialog -> {
@@ -1166,7 +1216,7 @@ public void updateDrawState(TextPaint ds) {
 
                 @Override
                 public void onClick(@NonNull View textView) {
-                    String url = PPApplication.DROIDIFY_PPP_RELEASES_URL;
+                    String url = PPApplication.IZZY_PPP_RELEASES_URL;
                     Intent i = new Intent(Intent.ACTION_VIEW);
                     i.setData(Uri.parse(url));
                     try {
@@ -1227,6 +1277,149 @@ public void onClick(@NonNull View textView) {
         dialogBuilder.setOnDismissListener(dialog -> activity.finish());
         alertDialog = dialogBuilder.create();
 
+//        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+//            @Override
+//            public void onShow(DialogInterface dialog) {
+//                Button positive = ((AlertDialog)dialog).getButton(DialogInterface.BUTTON_POSITIVE);
+//                if (positive != null) positive.setAllCaps(false);
+//                Button negative = ((AlertDialog)dialog).getButton(DialogInterface.BUTTON_NEGATIVE);
+//                if (negative != null) negative.setAllCaps(false);
+//            }
+//        });
+
+        if (!activity.isFinishing())
+            alertDialog.show();
+
+    }
+
+    @SuppressLint("InflateParams")
+    private void checkInNeoStore(final Activity activity) {
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+        dialogBuilder.setTitle(R.string.menu_check_github_releases);
+
+        String message = StringConstants.TAG_BOLD_START_HTML + getString(R.string.ppp_app_name) + StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_BREAK_HTML;
+        try {
+            PackageInfo pInfo = activity.getPackageManager().getPackageInfo(PPApplication.PACKAGE_NAME, 0);
+            message = message + StringConstants.TAG_BREAK_HTML + activity.getString(R.string.check_github_releases_installed_version) + " "+StringConstants.TAG_BOLD_START_HTML + pInfo.versionName + " (" + PPApplicationStatic.getVersionCode(pInfo) + ")"+StringConstants.TAG_BOLD_END_HTML;
+        } catch (Exception e) {
+            message = StringConstants.TAG_BREAK_HTML;
+        }
+
+        View layout;
+        LayoutInflater inflater = activity.getLayoutInflater();
+
+        /*
+        boolean fdroidInstalled = false;
+        PackageManager pm = activity.getPackageManager();
+        try {
+            pm.getPackageInfo(PPApplication.FDROID_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+            fdroidInstalled = true;
+        } catch (Exception ignored) {}
+        if (fdroidInstalled)
+            layout = inflater.inflate(R.layout.dialog_for_fdroid_app, null);
+        else
+            layout = inflater.inflate(R.layout.dialog_for_fdroid, null);
+         */
+        layout = inflater.inflate(R.layout.dialog_for_neostore, null);
+
+        dialogBuilder.setView(layout);
+
+        TextView text;
+        text = layout.findViewById(R.id.dialog_for_neostore_info_text);
+        message = message.replace(StringConstants.CHAR_NEW_LINE, StringConstants.TAG_BREAK_HTML);
+
+        text.setText(StringFormatUtils.fromHtml(message, false,  false, 0, 0, true));
+
+        //dialogBuilder.setIcon(android.R.drawable.ic_dialog_alert);
+        dialogBuilder.setCancelable(true);
+
+        boolean neostoreInstalled = false;
+        PackageManager pm = activity.getPackageManager();
+        try {
+            pm.getPackageInfo(PPApplication.NEOSTORE_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+            neostoreInstalled = true;
+        } catch (Exception ignored) {}
+
+        text = layout.findViewById(R.id.dialog_for_neostore_neostore_application);
+        View buttonsDivider = layout.findViewById(R.id.dialog_for_neostore_buttonsDivider);
+        if (!neostoreInstalled) {
+            text.setVisibility(View.VISIBLE);
+            buttonsDivider.setVisibility(View.VISIBLE);
+
+            CharSequence str1 = activity.getString(R.string.check_releases_neostore_ppp_release);
+            CharSequence str2 = str1 + " " + activity.getString(R.string.check_releases_ppp_release_clik_to_show) + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
+            Spannable sbt = new SpannableString(str2);
+            sbt.setSpan(new StyleSpan(android.graphics.Typeface.NORMAL), 0, str1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            ClickableSpan clickableSpan = new ClickableSpan() {
+                @Override
+                public void updateDrawState(TextPaint ds) {
+                    ds.setColor(ds.linkColor);    // you can use custom color
+                    ds.setUnderlineText(false);    // this remove the underline
+                }
+
+                @Override
+                public void onClick(@NonNull View textView) {
+                    String url = PPApplication.IZZY_PPP_RELEASES_URL;
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse(url));
+                    try {
+                        activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                    }
+                }
+            };
+            sbt.setSpan(clickableSpan, str1.length() + 1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            //sbt.setSpan(new UnderlineSpan(), str1.length()+1, str2.length(), 0);
+            text.setText(sbt);
+            text.setMovementMethod(LinkMovementMethod.getInstance());
+
+            if (Build.VERSION.SDK_INT >= 33) {
+                TextView text2 = layout.findViewById(R.id.dialog_for_neostore_apk_installation);
+                text2.setVisibility(View.VISIBLE);
+                String str = activity.getString(R.string.check_releases_install_from_apk_note1) +
+                        " " + activity.getString(R.string.install_ppp_store_neostore) +
+                        activity.getString(R.string.check_releases_install_from_apk_note2_ppp);
+                text2.setText(str);
+            }
+        } else {
+            text.setVisibility(View.GONE);
+            //buttonsDivider.setVisibility(View.GONE);
+        }
+
+        final boolean _neostoreInstalled = neostoreInstalled;
+        int buttonRes = R.string.alert_button_install_store;
+        if (neostoreInstalled)
+            buttonRes = R.string.check_releases_open_neostore;
+        dialogBuilder.setPositiveButton(buttonRes, (dialog, which) -> {
+            if (_neostoreInstalled) {
+                Intent intent = new Intent(Intent.ACTION_VIEW,
+                        Uri.parse("market://details?id=sk.henrichg.phoneprofilesplus"));
+                intent.setPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+                try {
+                    activity.startActivity(intent);
+                } catch (Exception e) {
+                    //Log.e("CheckPPPReleasesActivity.checkInNeoStore", Log.getStackTraceString(e));
+                    PPApplicationStatic.recordException(e);
+                }
+            }
+            else {
+                String url = PPApplication.NEOSTORE_APPLICATION_URL;
+                Intent i = new Intent(Intent.ACTION_VIEW);
+                i.setData(Uri.parse(url));
+                try {
+                    activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                }
+            }
+            activity.finish();
+        });
+        dialogBuilder.setNegativeButton(android.R.string.cancel, null);
+        dialogBuilder.setOnCancelListener(dialog -> activity.finish());
+        dialogBuilder.setOnDismissListener(dialog -> activity.finish());
+        alertDialog = dialogBuilder.create();
+
 //        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
 //            @Override
 //            public void onShow(DialogInterface dialog) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesBroadcastReceiver.java
index 1e399b55a0..084aa7f4a0 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckPPPReleasesBroadcastReceiver.java
@@ -163,7 +163,10 @@ private void doWork(/*boolean useHandler,*/ Context context) {
                             intent = packageManager.getLaunchIntentForPackage(PPApplication.DROIDIFY_PACKAGE_NAME);
                             boolean droidifyInstalled = (intent != null);
 
-                            getVersion = !(huaweiAppGalleryInstalled || fdroidInstalled || droidifyInstalled);
+                            intent = packageManager.getLaunchIntentForPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+                            boolean neostoreInstalled = (intent != null);
+
+                            getVersion = !(huaweiAppGalleryInstalled || fdroidInstalled || droidifyInstalled || neostoreInstalled);
                         }
                         if (getVersion)
                             _doWorkGitHub(appContext);
@@ -289,7 +292,7 @@ private static void _doWorkGitHub(Context appContext) {
                                 // check IzzyOnDroid repo
 
                                 RequestQueue queueIzzyRepo = Volley.newRequestQueue(appContext);
-                                String izzyRepoURL = PPApplication.DROIDIFY_PPP_LATEST_APK_RELEASE_URL_BEGIN;
+                                String izzyRepoURL = PPApplication.IZZY_PPP_LATEST_APK_RELEASE_URL_BEGIN;
                                 izzyRepoURL = izzyRepoURL + pppReleaseData.versionCodeInReleases + ".apk";
 //                                Log.e("CheckPPPReleasesBroadcastReceiver._doWorkGitHub", "izzyRepoURL=" + izzyRepoURL);
                                 StringRequest stringRequestIzzyRepo = new StringRequest(Request.Method.GET,
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckRequiredExtenderReleasesBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckRequiredExtenderReleasesBroadcastReceiver.java
index 38ae139bc6..f95df99e7e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckRequiredExtenderReleasesBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CheckRequiredExtenderReleasesBroadcastReceiver.java
@@ -166,7 +166,7 @@ static void doWork(final Context appContext) {
                 // because from Android 13 is required to install apk from app stores
 
                 RequestQueue queueIzzyRepo = Volley.newRequestQueue(appContext);
-                String izzyRepoURL = PPApplication.DROIDIFY_PPPE_LATEST_APK_RELEASE_URL_BEGIN;
+                String izzyRepoURL = PPApplication.IZZY_PPPE_LATEST_APK_RELEASE_URL_BEGIN;
                 izzyRepoURL = izzyRepoURL + PPApplication.VERSION_CODE_EXTENDER_LATEST + ".apk";
 //                Log.e("CheckRequiredExtenderReleasesBroadcastReceiver.doWork", "izzyRepoURL=" + izzyRepoURL);
                 StringRequest stringRequestIzzyRepo = new StringRequest(Request.Method.GET,
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ColorChooserPreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ColorChooserPreference.java
index 5bc2d0be63..8d9328f554 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ColorChooserPreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ColorChooserPreference.java
@@ -158,6 +158,7 @@ Drawable createSelector(int color) {
         GradientDrawable coloredCircle = new GradientDrawable();
         coloredCircle.setColor(color);
         coloredCircle.setShape(GradientDrawable.OVAL);
+        //noinspection IfStatementWithIdenticalBranches
         if (applicationTheme.equals(ApplicationPreferences.PREF_APPLICATION_THEME_VALUE_WHITE)) {
             //if (position == 2) // dark gray color
             //    coloredCircle.setStroke(2, Color.parseColor("#6E6E6E"));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CustomACRAReportingAdministrator.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CustomACRAReportingAdministrator.java
index a2ec29c264..5c2bcdd2fc 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CustomACRAReportingAdministrator.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/CustomACRAReportingAdministrator.java
@@ -92,6 +92,7 @@ public boolean shouldStartCollecting(@NonNull final Context context,
 
 //        Log.e("CustomACRAReportingAdministrator.shouldStartCollecting", "(2)");
 
+        //noinspection UnreachableCode
         try {
             if (PPApplication.crashIntoFile) {
                 final Context appContext = context.getApplicationContext();
@@ -147,7 +148,7 @@ public boolean shouldStartCollecting(@NonNull final Context context,
                 PPApplication.basicExecutorPool.submit(runnable);
             }
         } catch (Exception ee) {
-            //Log.e("CustomACRAReportingAdministrator.shouldStartCollecting", Log.getStackTraceString(ee));
+            Log.e("CustomACRAReportingAdministrator.shouldStartCollecting", Log.getStackTraceString(ee));
         }
 
 //        Log.e("CustomACRAReportingAdministrator.shouldStartCollecting", "(3)");
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapper.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapper.java
index 278138dc07..21bf31a297 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapper.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapper.java
@@ -430,8 +430,13 @@ void setProfileActive(Profile profile)
     {
 //        PPApplicationStatic.logE("[SYNCHRONIZED] DataWrapper.setProfileActive", "DataWrapper.profileList");
         synchronized (profileList) {
-            if (!profileListFilled)
-                return;
+//            Log.e("DataWrapper.setProfileActive", "xxxx");
+
+            if (!profileListFilled) {
+                //return;
+                // maybe is ok to fill it in this method and without icons and indicators. hm
+                fillProfileList(false, false);
+            }
 
             //noinspection ForLoopReplaceableByForEach
             for (Iterator<Profile> it = profileList.iterator(); it.hasNext();) {
@@ -439,12 +444,14 @@ void setProfileActive(Profile profile)
                 _profile._checked = false;
             }
 
-
             if (profile != null) {
+//                Log.e("DataWrapper.setProfileActive", "profile="+profile._name);
+
                 profile._checked = true;
                 PPApplicationStatic.setLastActivatedProfile(context, profile._id);
             }
             else {
+//                Log.e("DataWrapper.setProfileActive", "profile=0");
                 PPApplicationStatic.setLastActivatedProfile(context, 0);
             }
 
@@ -1520,6 +1527,7 @@ private void _activateProfile(Profile _profile, boolean merged, int startupSourc
         }
 
         DatabaseHandler.getInstance(context).activateProfile(_profile);
+//        Log.e("DataWrapper._activateProfile", "profile="+_profile._name);
         setProfileActive(_profile);
 
         // for STARTUP_SOURCE_EVENT, STARTUP_SOURCE_FOR_FIRST_START is mandatory
@@ -1672,7 +1680,8 @@ void activateProfileFromMainThread(Profile _profile, final boolean merged, final
                                     fifoAddProfile(activatedProfileId, 0);
 
                                 DatabaseHandler.getInstance(dataWrapper.context).increaseActivationByUserCount(profile);
-                                DataWrapperStatic.setDynamicLauncherShortcuts(context);
+//                                Log.e("DataWrapper.activateProfileFromMainThread", "xxxxx");
+                                DataWrapperStatic.setDynamicLauncherShortcuts(context, true);
                             }
                         }
 
@@ -1791,6 +1800,7 @@ private void activateProfileWithAlert(Profile profile, int startupSource, /*fina
                                     }
                                 }
 
+//                                Log.e("DataWrapper.activateProfileWithAlert", "(1) xxxxx");
                                 _dataWrapper.activateProfileFromMainThread(_profile, false, _startupSource, true, _activity, false);
                             } else {
                                 Intent returnIntent = new Intent();
@@ -1839,6 +1849,7 @@ private void activateProfileWithAlert(Profile profile, int startupSource, /*fina
             }
             else {
                 if (!DataWrapperStatic.displayPreferencesErrorNotification(profile, null, true, context)) {
+//                    Log.e("DataWrapper.activateProfileWithAlert", "(2) xxxxx");
                     activateProfileFromMainThread(profile, false, startupSource, true, activity, false);
                 }
                 else {
@@ -1993,13 +2004,16 @@ void activateProfile(final long profile_id, final int startupSource, final Activ
                 activateProfileFromMainThread(profile, false, PPApplication.STARTUP_SOURCE_FOR_FIRST_START,
                         false, null, testGrant);
             }
-            else
+            else {
+//                Log.e("DataWrapper.activateProfile", "xxxxx");
                 activateProfileWithAlert(profile, startupSource, /*interactive,*/ activity);
+            }
         }
         else
         {
             if (profile != null) {
                 DatabaseHandler.getInstance(context).activateProfile(profile);
+//                Log.e("DataWrapper.activateProfile", "profile="+profile._name);
                 setProfileActive(profile);
             }
 
@@ -2305,6 +2319,7 @@ else if ((activity instanceof RestartEventsFromGUIActivity) ||
                             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
                             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
                             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+                            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //                    PPApplicationStatic.logE("[START_PP_SERVICE] DataWrapper.restartEventsWithAlert", "xxx");
                             PPApplicationStatic.startPPService(context, serviceIntent, true);
                         } else {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapperStatic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapperStatic.java
index 505a8e074b..8cb194ec4a 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapperStatic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DataWrapperStatic.java
@@ -29,6 +29,10 @@
 /** @noinspection ExtractMethodRecommender*/
 class DataWrapperStatic {
 
+    private DataWrapperStatic() {
+        // private constructor to prevent instantiation
+    }
+
     static Profile getNonInitializedProfile(String name, String icon, int order)
     {
         //noinspection ConstantConditions
@@ -627,57 +631,113 @@ static private ShortcutInfo createShortcutInfo(Profile profile, boolean restartE
                 .build();
     }
 
-    static void setDynamicLauncherShortcuts(final Context appContext) {
+    static void setDynamicLauncherShortcuts(final Context appContext, boolean addActivatedProfile) {
         try {
-            //final Context appContext = context.getApplicationContext();
-            LocaleHelper.setApplicationLocale(appContext);
-
-            ShortcutManager shortcutManager = appContext.getSystemService(ShortcutManager.class);
-
-            if (shortcutManager != null) {
-                final int limit = 4;
-
-                //List<Profile> countedProfiles = DatabaseHandler.getInstance(context).getProfilesForDynamicShortcuts(true);
-                List<Profile> countedProfiles = DatabaseHandler.getInstance(appContext).getProfilesInQuickTilesForDynamicShortcuts();
-                List<Profile> notCountedProfiles = DatabaseHandler.getInstance(appContext).getProfilesForDynamicShortcuts(/*false*/);
-
-                ArrayList<ShortcutInfo> shortcuts = new ArrayList<>();
-
-                //Profile _profile = DataWrapper.getNonInitializedProfile(context.getString(R.string.menu_restart_events), "ic_profile_restart_events|1|0|0", 0);
-                Profile _profile = getNonInitializedProfile(appContext.getString(R.string.menu_restart_events),
-                        StringConstants.PROFILE_ICON_RESTART_EVENTS+"|1|1|"+ApplicationPreferences.applicationRestartEventsIconColor, 0);
-                _profile.generateIconBitmap(appContext, false, 0, false);
-                // first profile is restart events
-                shortcuts.add(createShortcutInfo(_profile, true, appContext));
-
-                int shortcutsCount = 0;
-                for (Profile profile : countedProfiles) {
-                    profile.generateIconBitmap(appContext, false, 0, false);
-                    shortcuts.add(createShortcutInfo(profile, false, appContext));
-                    ++shortcutsCount;
-                    if (shortcutsCount == limit)
-                        break;
-                }
+            synchronized (PPApplication.dynamicShortcutsMutex) {
+
+                //final Context appContext = context.getApplicationContext();
+                LocaleHelper.setApplicationLocale(appContext);
+
+                ShortcutManager shortcutManager = appContext.getSystemService(ShortcutManager.class);
+
+                if (shortcutManager != null) {
+                    final int limit = 4; // must be 4, because higer value removes restart events
 
-                //int shortcutsCount = countedProfiles.size();
-                if (shortcutsCount < limit) {
-                    for (Profile profile : notCountedProfiles) {
+                    // get saved dynamic shortcuts profiles
+                    List<Profile> _shortcutProfiles = DatabaseHandler.getInstance(appContext).getProfilesForDynamicShortcuts2();
+                    //List<Profile> __shortcutProfiles = new ArrayList<>();
+//                    for (Profile profile : _shortcutProfiles)
+//                        Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "(0) profileId="+profile._name);
+
+                    Profile activatedProfile = DatabaseHandler.getInstance(appContext).getActivatedProfile();
+//                    Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "activatedProfile="+activatedProfile);
+
+                    // remove duplicates
+                    //List<Profile> _shortcutProfiles = __shortcutProfiles.stream().distinct().collect(Collectors.toList());
+
+                    // copy only profiles, which are not activated
+                    //List<Profile> _shortcutProfiles = new ArrayList<>();
+                    /*if (activatedProfile != null) {
+                        for (int i = 0; i < __shortcutProfiles.size(); i++) {
+                            Profile profile = __shortcutProfiles.get(i);
+                            if (profile._id != activatedProfile._id)
+                                _shortcutProfiles.add(profile);
+                        }
+                    } else*/
+                    //    _shortcutProfiles.addAll(__shortcutProfiles);
+
+                    // copy first 3 profiles
+                    List<Profile> shortcutProfiles;
+                    int subListCount = _shortcutProfiles.size();
+                    if (subListCount > 0) {
+                        if (subListCount > limit - 1)
+                            subListCount = limit - 1;
+                        shortcutProfiles = _shortcutProfiles.subList(0, subListCount);
+                    } else
+                        shortcutProfiles = new ArrayList<>(_shortcutProfiles);
+//                    for (Profile profile : shortcutProfiles)
+//                        Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "(1) profileId="+profile._id);
+
+//                    Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "addActivatedProfile="+addActivatedProfile);
+                    // add activated profile as first
+                    if (addActivatedProfile) {
+                        if (activatedProfile != null) {
+                            boolean alreadyAdded = false;
+                            for (Profile profile : shortcutProfiles) {
+                                if (profile._id == activatedProfile._id) {
+                                    alreadyAdded = true;
+                                    break;
+                                }
+                            }
+                            if (!alreadyAdded)
+                                shortcutProfiles.add(0, activatedProfile);
+
+                            // save new shortcuts to shared preferences
+                            int shortcutCount = shortcutProfiles.size();
+//                            Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "shortcutCount="+shortcutCount);
+                            for (int i = 0; i < shortcutCount; i++) {
+//                                Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "(3) profile="+shortcutProfiles.get(i)._name);
+                                ApplicationPreferences.setDynamicShortcutProfileId(appContext, i, shortcutProfiles.get(i)._id);
+                            }
+                            // if shortcutCount < limit-1, must be saved with profoielId=0
+                            for (int i = shortcutCount; i < (limit - 1); i++) {
+//                                Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "(4) i="+i);
+                                ApplicationPreferences.setDynamicShortcutProfileId(appContext, i, 0);
+                            }
+                        }
+                    }
+//                    for (Profile profile : _shortcutProfiles)
+//                        Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "(2) profileId="+profile._id);
+
+                    ArrayList<ShortcutInfo> shortcuts = new ArrayList<>();
+
+                    // add "Restart events"
+                    Profile _profile = getNonInitializedProfile(appContext.getString(R.string.menu_restart_events),
+                            StringConstants.PROFILE_ICON_RESTART_EVENTS + "|1|1|" + ApplicationPreferences.applicationRestartEventsIconColor, 0);
+                    _profile.generateIconBitmap(appContext, false, 0, false);
+                    // first profile is restart events
+                    shortcuts.add(createShortcutInfo(_profile, true, appContext));
+
+                    int shortcutsCount = 1; // restart events added
+
+//                    Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "shortcutProfiles - start");
+                    for (Profile profile : shortcutProfiles) { // tu pouzi ten newShortcutProfiles, kde budu len 4 profily
+//                        Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "profile._name="+profile._name);
                         profile.generateIconBitmap(appContext, false, 0, false);
                         shortcuts.add(createShortcutInfo(profile, false, appContext));
                         ++shortcutsCount;
                         if (shortcutsCount == limit)
                             break;
                     }
-                }
-
-//                    PPApplicationStatic.logE("DataWrapperStatic.setDynamicLauncherShortcuts", "shortcuts.size()="+shortcuts.size());
-
-                shortcutManager.removeAllDynamicShortcuts();
-                if (!shortcuts.isEmpty()) {
-                    shortcutManager.addDynamicShortcuts(shortcuts);
-                    if (Build.VERSION.SDK_INT >= 30) {
-                        for (ShortcutInfo shortcut : shortcuts)
-                            shortcutManager.pushDynamicShortcut(shortcut);
+//                    Log.e("DataWrapperStatic.setDynamicLauncherShortcuts", "shortcutProfiles - end");
+
+                    shortcutManager.removeAllDynamicShortcuts();
+                    if (!shortcuts.isEmpty()) {
+                        shortcutManager.addDynamicShortcuts(shortcuts);
+                        if (Build.VERSION.SDK_INT >= 30) {
+                            for (ShortcutInfo shortcut : shortcuts)
+                                shortcutManager.pushDynamicShortcut(shortcut);
+                        }
                     }
                 }
             }
@@ -696,7 +756,7 @@ static void setDynamicLauncherShortcuts(final Context appContext) {
         }
     }
 
-    static void setDynamicLauncherShortcutsFromMainThread(final Context context)
+    static void setDynamicLauncherShortcutsFromMainThread(final Context context, boolean addActivatedProfile)
     {
         //final DataWrapper dataWrapper = copyDataWrapper();
 
@@ -718,7 +778,7 @@ static void setDynamicLauncherShortcutsFromMainThread(final Context context)
                     wakeLock.acquire(10 * 60 * 1000);
                 }
 
-                DataWrapperStatic.setDynamicLauncherShortcuts(appContext);
+                DataWrapperStatic.setDynamicLauncherShortcuts(appContext, addActivatedProfile);
 
             } catch (Exception e) {
 //                    PPApplicationStatic.logE("[IN_EXECUTOR] PPApplication.startHandlerThread", Log.getStackTraceString(e));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandler.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandler.java
index ca0a2636f7..82439fe4d3 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandler.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandler.java
@@ -22,7 +22,7 @@ public class DatabaseHandler extends SQLiteOpenHelper {
     final Context context;
     
     // Database Version
-    static final int DATABASE_VERSION = 2522;
+    static final int DATABASE_VERSION = 2523;
 
     // Database Name
     static final String DATABASE_NAME = "phoneProfilesManager";
@@ -488,6 +488,7 @@ public class DatabaseHandler extends SQLiteOpenHelper {
     // Mobile cells Columns names
     static final String KEY_MC_ID = "_id";
     static final String KEY_MC_CELL_ID = "cellId";
+    static final String KEY_MC_CELL_ID_LONG = "cellIdLong";
     static final String KEY_MC_NAME = "name";
     static final String KEY_MC_NEW = "new";
     static final String KEY_MC_LAST_CONNECTED_TIME = "lastConnectedTime";
@@ -889,13 +890,19 @@ void increaseActivationByUserCount(Profile profile) {
         DatabaseHandlerProfiles.increaseActivationByUserCount(this, profile);
     }
 
-    List<Profile> getProfilesForDynamicShortcuts(/*boolean counted*/) {
+/*
+    List<Profile> getProfilesForDynamicShortcuts() {
         return DatabaseHandlerProfiles.getProfilesForDynamicShortcuts(this);
     }
 
     List<Profile> getProfilesInQuickTilesForDynamicShortcuts() {
         return DatabaseHandlerProfiles.getProfilesInQuickTilesForDynamicShortcuts(this);
     }
+*/
+
+    List<Profile> getProfilesForDynamicShortcuts2() {
+        return DatabaseHandlerProfiles.getProfilesForDynamicShortcuts2(this);
+    }
 
     void updateProfileShowInActivator(Profile profile) {
         DatabaseHandlerProfiles.updateProfileShowInActivator(this, profile);
@@ -1267,8 +1274,8 @@ void deleteShortcut(long shortcutId) {
 // MOBILE_CELLS ----------------------------------------------------------------------
 
     // add mobile cells to list
-    void addMobileCellsToList(List<MobileCellsData> cellsList, int onlyCellId) {
-        DatabaseHandlerEvents.addMobileCellsToList(this, cellsList, onlyCellId, false);
+    void addMobileCellsToList(List<MobileCellsData> cellsList, int onlyCellId, long onlyCellIdLong) {
+        DatabaseHandlerEvents.addMobileCellsToList(this, cellsList, onlyCellId, onlyCellIdLong, false);
     }
 
     /** @noinspection SameParameterValue*/
@@ -1280,12 +1287,12 @@ String renameMobileCellsList(List<MobileCellsData> cellsList, String cellName, b
         return DatabaseHandlerEvents.renameMobileCellsList(this, cellsList, cellName, _new, selectedIds);
     }
 
-    void deleteMobileCell(int mobileCell) {
-        DatabaseHandlerEvents.deleteMobileCell(this, mobileCell, false);
+    void deleteMobileCell(int mobileCell, long mobileCellLong) {
+        DatabaseHandlerEvents.deleteMobileCell(this, mobileCell, mobileCellLong, false);
     }
 
-    void updateMobileCellLastConnectedTime(int mobileCell, long lastConnectedTime) {
-        DatabaseHandlerEvents.updateMobileCellLastConnectedTime(this, mobileCell, lastConnectedTime);
+    void updateMobileCellLastConnectedTime(int mobileCell, long mobileCellLong, long lastConnectedTime) {
+        DatabaseHandlerEvents.updateMobileCellLastConnectedTime(this, mobileCell, mobileCellLong, lastConnectedTime);
     }
 
     void setAllMobileCellsAsOld() {
@@ -1310,8 +1317,8 @@ void updateMobileCellsCells(long eventId, String cells) {
     }
 
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    boolean isMobileCellSaved(int mobileCell) {
-        return DatabaseHandlerEvents.isMobileCellSaved(this, mobileCell);
+    boolean isMobileCellSaved(int mobileCell, long mobileCellLong) {
+        return DatabaseHandlerEvents.isMobileCellSaved(this, mobileCell, mobileCellLong);
     }
 
     void loadMobileCellsSensorEvents(List<MobileCellsSensorEvent> eventList/*, boolean outsideParameter*/) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerCreateUpdateDB.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerCreateUpdateDB.java
index 28193e01d1..d13cd36058 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerCreateUpdateDB.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerCreateUpdateDB.java
@@ -3,6 +3,7 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -424,7 +425,8 @@ static void createTables(SQLiteDatabase db) {
                 + DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS + " " + DatabaseHandler.TEXT_TYPE + ","
                 + DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS + " " + DatabaseHandler.TEXT_TYPE + ","
                 + DatabaseHandler.KEY_MC_DO_NOT_DETECT + " " + DatabaseHandler.INTEGER_TYPE + ","
-                + DatabaseHandler.KEY_MC_CELL_ID_T + " " + DatabaseHandler.TEXT_TYPE
+                + DatabaseHandler.KEY_MC_CELL_ID_T + " " + DatabaseHandler.TEXT_TYPE + ","
+                + DatabaseHandler.KEY_MC_CELL_ID_LONG + " " + DatabaseHandler.INTEGER_TYPE
                 + ")";
         db.execSQL(CREATE_MOBILE_CELLS_TABLE);
 
@@ -535,6 +537,7 @@ static void createIndexes(SQLiteDatabase db) {
         db.execSQL("CREATE INDEX IF NOT EXISTS IDX_NAME ON " + DatabaseHandler.TABLE_MOBILE_CELLS + " (" + DatabaseHandler.KEY_MC_NAME + ")");
         db.execSQL("CREATE INDEX IF NOT EXISTS IDX_CELL_ID ON " + DatabaseHandler.TABLE_MOBILE_CELLS + " (" + DatabaseHandler.KEY_MC_CELL_ID + ")");
         db.execSQL("CREATE INDEX IF NOT EXISTS IDX_NAME ON " + DatabaseHandler.TABLE_NFC_TAGS + " (" + DatabaseHandler.KEY_NT_NAME + ")");
+        db.execSQL("CREATE INDEX IF NOT EXISTS IDX_CELL_ID_LONG ON " + DatabaseHandler.TABLE_MOBILE_CELLS + " (" + DatabaseHandler.KEY_MC_CELL_ID_LONG + ")");
 
         db.execSQL("CREATE INDEX IF NOT EXISTS IDX_ACTIVATION_BY_USER_COUNT ON " + DatabaseHandler.TABLE_PROFILES + " (" + DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT + ")");
         db.execSQL("CREATE INDEX IF NOT EXISTS IDX_FK_PROFILE_START_WHEN_ACTIVATED ON " + DatabaseHandler.TABLE_EVENTS + " (" + DatabaseHandler.KEY_E_FK_PROFILE_START_WHEN_ACTIVATED + ")");
@@ -947,6 +950,7 @@ static void createTableColumsWhenNotExists(SQLiteDatabase db, String table) {
                 createColumnWhenNotExists(db, table, DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS, DatabaseHandler.TEXT_TYPE, columns);
                 createColumnWhenNotExists(db, table, DatabaseHandler.KEY_MC_DO_NOT_DETECT, DatabaseHandler.INTEGER_TYPE, columns);
                 createColumnWhenNotExists(db, table, DatabaseHandler.KEY_MC_CELL_ID_T, DatabaseHandler.TEXT_TYPE, columns);
+                createColumnWhenNotExists(db, table, DatabaseHandler.KEY_MC_CELL_ID_LONG, DatabaseHandler.INTEGER_TYPE, columns);
                 break;
             case DatabaseHandler.TABLE_NFC_TAGS:
                 createColumnWhenNotExists(db, table, DatabaseHandler.KEY_NT_NAME, DatabaseHandler.TEXT_TYPE, columns);
@@ -3576,6 +3580,11 @@ else if (cellNames.equals(cellName))
             db.execSQL("UPDATE " + DatabaseHandler.TABLE_MERGED_PROFILE + " SET " + DatabaseHandler.KEY_DEVICE_WALLPAPER_LOCKSCREEN + "='-'");
         }
 
+        if (oldVersion < 2523) {
+            if (Build.VERSION.SDK_INT >= 29)
+                db.execSQL("UPDATE " + DatabaseHandler.TABLE_MOBILE_CELLS + " SET " + DatabaseHandler.KEY_MC_CELL_ID_LONG + "="+ Long.MAX_VALUE);
+        }
+
     }
 
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerEvents.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerEvents.java
index 09956d760c..806d89ad5e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerEvents.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerEvents.java
@@ -4781,6 +4781,7 @@ static private void addMobileCell(DatabaseHandler instance, MobileCell mobileCel
 
                 ContentValues values = new ContentValues();
                 values.put(DatabaseHandler.KEY_MC_CELL_ID, mobileCell._cellId);
+                values.put(DatabaseHandler.KEY_MC_CELL_ID_LONG, mobileCell._cellIdLong);
                 values.put(DatabaseHandler.KEY_MC_NAME, mobileCell._name);
                 values.put(DatabaseHandler.KEY_MC_NEW, mobileCell._new ? 1 : 0);
                 values.put(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME, mobileCell._lastConnectedTime);
@@ -4823,6 +4824,7 @@ static private void updateMobileCell(DatabaseHandler instance, MobileCell mobile
 
                 ContentValues values = new ContentValues();
                 values.put(DatabaseHandler.KEY_MC_CELL_ID, mobileCell._cellId);
+                values.put(DatabaseHandler.KEY_MC_CELL_ID_LONG, mobileCell._cellIdLong);
                 values.put(DatabaseHandler.KEY_MC_NAME, mobileCell._name);
                 values.put(DatabaseHandler.KEY_MC_NEW, mobileCell._new ? 1 : 0);
                 values.put(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME, mobileCell._lastConnectedTime);
@@ -4857,7 +4859,8 @@ static private void updateMobileCell(DatabaseHandler instance, MobileCell mobile
     }
 
     // add mobile cells to list
-    static void addMobileCellsToList(DatabaseHandler instance, List<MobileCellsData> cellsList, int onlyCellId,
+    static void addMobileCellsToList(DatabaseHandler instance, List<MobileCellsData> cellsList,
+                                     int onlyCellId, long onlyCellIdlong,
                                      boolean calledFromImportDB) {
         if (!calledFromImportDB)
             instance.importExportLock.lock();
@@ -4867,7 +4870,9 @@ static void addMobileCellsToList(DatabaseHandler instance, List<MobileCellsData>
                     instance.startRunningCommand();
 
                 // Select All Query
-                String selectQuery = "SELECT " + DatabaseHandler.KEY_MC_CELL_ID + "," +
+                String selectQuery = "SELECT " +
+                        DatabaseHandler.KEY_MC_CELL_ID + "," +
+                        DatabaseHandler.KEY_MC_CELL_ID_LONG + "," +
                         DatabaseHandler.KEY_MC_NAME + "," +
                         DatabaseHandler.KEY_MC_NEW + "," +
                         DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME + //"," +
@@ -4876,44 +4881,65 @@ static void addMobileCellsToList(DatabaseHandler instance, List<MobileCellsData>
                         //DatabaseHandler.KEY_MC_DO_NOT_DETECT +
                         " FROM " + DatabaseHandler.TABLE_MOBILE_CELLS;
 
-                if (onlyCellId != 0) {
-                    selectQuery = selectQuery +
-                            " WHERE " + DatabaseHandler.KEY_MC_CELL_ID + "=" + onlyCellId;
+                boolean whereAdded = true; // all cells from db
+                if ((onlyCellId != 0) && (onlyCellIdlong != 0)) {
+                    whereAdded = false; // only specified cell from db
+                    if (onlyCellId != Integer.MAX_VALUE) {
+                        selectQuery = selectQuery +
+                                " WHERE " + DatabaseHandler.KEY_MC_CELL_ID + "=" + onlyCellId;
+                        whereAdded = true;
+                    }
+                    else if (onlyCellIdlong != Long.MAX_VALUE) {
+                        selectQuery = selectQuery +
+                                " WHERE " + DatabaseHandler.KEY_MC_CELL_ID_LONG + "=" + onlyCellIdlong;
+                        whereAdded = true;
+                    }
                 }
 
-                //SQLiteDatabase db = this.getReadableDatabase();
-                SQLiteDatabase db = instance.getMyWritableDatabase();
+                if (whereAdded) {
+                    //SQLiteDatabase db = this.getReadableDatabase();
+                    SQLiteDatabase db = instance.getMyWritableDatabase();
 
-                Cursor cursor = db.rawQuery(selectQuery, null);
+                    Cursor cursor = db.rawQuery(selectQuery, null);
 
-                // looping through all rows and adding to list
-                if (cursor.moveToFirst()) {
-                    do {
-                        int cellId = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID));
-                        String name = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NAME));
-                        boolean _new = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NEW)) == 1;
-                        long lastConnectedTime = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME));
-                        //String lastRunningEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS));
-                        //String lastPausedEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS));
-                        //boolean doNotDetect = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_DO_NOT_DETECT)) == 1;
-                        //Log.e("DatabaseHandlerEvents.addMobileCellsToList", "cellId="+cellId + " new="+_new);
-                        boolean found = false;
-                        for (MobileCellsData cell : cellsList) {
-                            if (cell.cellId == cellId) {
-                                found = true;
-                                break;
+                    // looping through all rows and adding to list
+                    if (cursor.moveToFirst()) {
+                        do {
+                            int cellIdDB = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID));
+                            long cellIdDBLong = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID_LONG));
+                            String name = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NAME));
+                            boolean _new = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NEW)) == 1;
+                            long lastConnectedTime = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME));
+                            //String lastRunningEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS));
+                            //String lastPausedEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS));
+                            //boolean doNotDetect = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_DO_NOT_DETECT)) == 1;
+                            //Log.e("DatabaseHandlerEvents.addMobileCellsToList", "cellId="+cellId + " new="+_new);
+                            boolean found = false;
+                            for (MobileCellsData cellData : cellsList) {
+                                if (cellIdDB != Integer.MAX_VALUE) {
+                                    if (cellData.cellId == cellIdDB) {
+                                        found = true;
+                                        break;
+                                    }
+                                } else if (cellIdDBLong != Long.MAX_VALUE) {
+                                    if (cellData.cellIdLong == cellIdDBLong) {
+                                        found = true;
+                                        break;
+                                    }
+                                }
                             }
-                        }
-                        if (!found) {
-                            MobileCellsData cell = new MobileCellsData(cellId, name, false, _new, lastConnectedTime/*,
+                            if (!found) {
+                                MobileCellsData cell = new MobileCellsData(
+                                        cellIdDB, cellIdDBLong, name, false, _new, lastConnectedTime/*,
                                     lastRunningEvents, lastPausedEvents, doNotDetect*/);
-                            cellsList.add(cell);
-                        }
-                    } while (cursor.moveToNext());
-                }
+                                cellsList.add(cell);
+                            }
+                        } while (cursor.moveToNext());
+                    }
 
-                cursor.close();
-                //db.close();
+                    cursor.close();
+                    //db.close();
+                }
             } catch (Exception e) {
                 PPApplicationStatic.recordException(e);
             }
@@ -4932,6 +4958,7 @@ static void saveMobileCellsList(DatabaseHandler instance, List<MobileCellsData>
                 // Select All Query
                 final String selectQuery = "SELECT " + DatabaseHandler.KEY_MC_ID + "," +
                         DatabaseHandler.KEY_MC_CELL_ID + "," +
+                        DatabaseHandler.KEY_MC_CELL_ID_LONG + "," +
                         DatabaseHandler.KEY_MC_NAME + "," +
                         DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME + //"," +
                         //DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS + "," +
@@ -4954,16 +4981,30 @@ static void saveMobileCellsList(DatabaseHandler instance, List<MobileCellsData>
                     //boolean doNotDetect = false;
                     if (cursor.moveToFirst()) {
                         do {
-                            String dbCellId = Integer.toString(cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID)));
-                            if (dbCellId.equals(Integer.toString(cell.cellId))) {
-                                foundedDbId = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_ID));
-                                foundedCellName = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NAME));
-                                foundedLastConnectedTime = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME));
-                                //foundedLastRunningEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS));
-                                //foundedLastPausedEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS));
-                                //doNotDetect = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_DO_NOT_DETECT)) == 1;
-                                found = true;
-                                break;
+                            int dbCellId = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID));
+                            long dbCellIdLong = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID_LONG));
+                            if (dbCellId != Integer.MAX_VALUE) {
+                                if (dbCellId == cell.cellId) {
+                                    foundedDbId = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_ID));
+                                    foundedCellName = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NAME));
+                                    foundedLastConnectedTime = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME));
+                                    //foundedLastRunningEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS));
+                                    //foundedLastPausedEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS));
+                                    //doNotDetect = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_DO_NOT_DETECT)) == 1;
+                                    found = true;
+                                    break;
+                                }
+                            } else if (dbCellIdLong != Long.MAX_VALUE) {
+                                if (dbCellIdLong == cell.cellIdLong) {
+                                    foundedDbId = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_ID));
+                                    foundedCellName = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_NAME));
+                                    foundedLastConnectedTime = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_CONNECTED_TIME));
+                                    //foundedLastRunningEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_RUNNING_EVENTS));
+                                    //foundedLastPausedEvents = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_LAST_PAUSED_EVENTS));
+                                    //doNotDetect = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_DO_NOT_DETECT)) == 1;
+                                    found = true;
+                                    break;
+                                }
                             }
                         } while (cursor.moveToNext());
                     }
@@ -4971,6 +5012,7 @@ static void saveMobileCellsList(DatabaseHandler instance, List<MobileCellsData>
                     if (!found) {
                         //Log.d("DatabaseHandler.saveMobileCellsList", "!found");
                         mobileCell._cellId = cell.cellId;
+                        mobileCell._cellIdLong = cell.cellIdLong;
                         mobileCell._name = cell.name;
                         mobileCell._new = true;
                         mobileCell._lastConnectedTime = cell.lastConnectedTime;
@@ -4984,6 +5026,7 @@ static void saveMobileCellsList(DatabaseHandler instance, List<MobileCellsData>
                         //Log.d("DatabaseHandler.saveMobileCellsList", "found="+foundedDbId+" cell.new="+cell._new+" new="+_new);
                         mobileCell._id = foundedDbId;
                         mobileCell._cellId = cell.cellId;
+                        mobileCell._cellIdLong = cell.cellIdLong;
                         mobileCell._name = cell.name;
                         if (!renameExistingCell && !foundedCellName.isEmpty())
                             mobileCell._name = foundedCellName;
@@ -5020,6 +5063,7 @@ static String renameMobileCellsList(DatabaseHandler instance, List<MobileCellsDa
                 // Select All Query
                 final String selectQuery = "SELECT " + DatabaseHandler.KEY_MC_ID + "," +
                         DatabaseHandler.KEY_MC_CELL_ID + "," +
+                        DatabaseHandler.KEY_MC_CELL_ID_LONG + "," +
                         DatabaseHandler.KEY_MC_NAME +
                         " FROM " + DatabaseHandler.TABLE_MOBILE_CELLS;
 
@@ -5035,11 +5079,21 @@ static String renameMobileCellsList(DatabaseHandler instance, List<MobileCellsDa
                     long foundedDbId = 0;
                     if (cursor.moveToFirst()) {
                         do {
-                            String dbCellId = Integer.toString(cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID)));
-                            if (dbCellId.equals(Integer.toString(cell.cellId))) {
-                                foundedDbId = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_ID));
-                                found = true;
-                                break;
+                            int dbCellId = cursor.getInt(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID));
+                            long dbCellIdLong = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_CELL_ID_LONG));
+                            if ((dbCellId != Integer.MAX_VALUE) && (cell.cellId != Integer.MAX_VALUE)) {
+                                if (dbCellId == cell.cellId) {
+                                    foundedDbId = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_ID));
+                                    found = true;
+                                    break;
+                                }
+                            } else
+                            if ((dbCellIdLong != Long.MAX_VALUE) && (cell.cellIdLong != Long.MAX_VALUE)) {
+                                if (dbCellIdLong == cell.cellIdLong) {
+                                    foundedDbId = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_MC_ID));
+                                    found = true;
+                                    break;
+                                }
                             }
                         } while (cursor.moveToNext());
                     }
@@ -5053,6 +5107,7 @@ static String renameMobileCellsList(DatabaseHandler instance, List<MobileCellsDa
                                 MobileCell mobileCell = new MobileCell();
                                 mobileCell._id = foundedDbId;
                                 mobileCell._cellId = cell.cellId;
+                                mobileCell._cellIdLong = cell.cellIdLong;
                                 mobileCell._name = cell.name;
                                 mobileCell._new = true;
                                 mobileCell._lastConnectedTime = cell.lastConnectedTime;
@@ -5072,13 +5127,23 @@ static String renameMobileCellsList(DatabaseHandler instance, List<MobileCellsDa
                                 // change selected
                                 String[] splits = selectedIds.split(StringConstants.STR_SPLIT_REGEX);
                                 for (String valueCell : splits) {
-                                    if (valueCell.equals(Integer.toString(cell.cellId))) {
+                                    boolean updateCell = false;
+                                    long _valueCell = Long.parseLong(valueCell);
+                                    if (cell.cellId != Integer.MAX_VALUE) {
+                                        if (_valueCell == cell.cellId)
+                                            updateCell = true;
+                                    } else if (cell.cellIdLong != Long.MAX_VALUE) {
+                                        if (_valueCell == cell.cellIdLong)
+                                            updateCell = true;
+                                    }
+                                    if (updateCell) {
                                         String oldCellName = cell.name;
 
                                         cell.name = toCellName;
                                         MobileCell mobileCell = new MobileCell();
                                         mobileCell._id = foundedDbId;
                                         mobileCell._cellId = cell.cellId;
+                                        mobileCell._cellIdLong = cell.cellIdLong;
                                         mobileCell._name = cell.name;
                                         mobileCell._new = cell._new;
                                         mobileCell._lastConnectedTime = cell.lastConnectedTime;
@@ -5104,6 +5169,7 @@ static String renameMobileCellsList(DatabaseHandler instance, List<MobileCellsDa
                                 MobileCell mobileCell = new MobileCell();
                                 mobileCell._id = foundedDbId;
                                 mobileCell._cellId = cell.cellId;
+                                mobileCell._cellIdLong = cell.cellIdLong;
                                 mobileCell._name = cell.name;
                                 mobileCell._new = cell._new;
                                 mobileCell._lastConnectedTime = cell.lastConnectedTime;
@@ -5136,7 +5202,7 @@ static String renameMobileCellsList(DatabaseHandler instance, List<MobileCellsDa
         return "";
     }
 
-    static void deleteMobileCell(DatabaseHandler inctance, int mobileCell, boolean calledFromImportDB) {
+    static void deleteMobileCell(DatabaseHandler inctance, int mobileCell, long mobileCellLong, boolean calledFromImportDB) {
         if (!calledFromImportDB)
             inctance.importExportLock.lock();
         try {
@@ -5150,9 +5216,14 @@ static void deleteMobileCell(DatabaseHandler inctance, int mobileCell, boolean c
                 db.beginTransaction();
 
                 try {
-                    // delete geofence
-                    db.delete(DatabaseHandler.TABLE_MOBILE_CELLS, DatabaseHandler.KEY_MC_CELL_ID + " = ?",
+                    // delete mobile cell
+                    if (mobileCell != Integer.MAX_VALUE)
+                        db.delete(DatabaseHandler.TABLE_MOBILE_CELLS, DatabaseHandler.KEY_MC_CELL_ID + " = ?",
                             new String[]{String.valueOf(mobileCell)});
+                    else
+                    if (mobileCellLong != Long.MAX_VALUE)
+                        db.delete(DatabaseHandler.TABLE_MOBILE_CELLS, DatabaseHandler.KEY_MC_CELL_ID_LONG + " = ?",
+                                new String[]{String.valueOf(mobileCellLong)});
 
                     db.setTransactionSuccessful();
                 } catch (Exception e) {
@@ -5173,7 +5244,7 @@ static void deleteMobileCell(DatabaseHandler inctance, int mobileCell, boolean c
         }
     }
 
-    static void updateMobileCellLastConnectedTime(DatabaseHandler instance, int mobileCell, long lastConnectedTime) {
+    static void updateMobileCellLastConnectedTime(DatabaseHandler instance, int mobileCell, long mobileCellLong, long lastConnectedTime) {
         instance.importExportLock.lock();
         try {
             try {
@@ -5189,8 +5260,13 @@ static void updateMobileCellLastConnectedTime(DatabaseHandler instance, int mobi
 
                 try {
                     // updating row
-                    db.update(DatabaseHandler.TABLE_MOBILE_CELLS, values, DatabaseHandler.KEY_MC_CELL_ID + " = ?",
+                    if (mobileCell != Integer.MAX_VALUE)
+                        db.update(DatabaseHandler.TABLE_MOBILE_CELLS, values, DatabaseHandler.KEY_MC_CELL_ID + " = ?",
                             new String[]{String.valueOf(mobileCell)});
+                    else
+                    if (mobileCellLong != Long.MAX_VALUE)
+                        db.update(DatabaseHandler.TABLE_MOBILE_CELLS, values, DatabaseHandler.KEY_MC_CELL_ID_LONG + " = ?",
+                                new String[]{String.valueOf(mobileCellLong)});
 
                     db.setTransactionSuccessful();
 
@@ -5393,7 +5469,7 @@ static void updateMobileCellsCells(DatabaseHandler instance, long eventId, Strin
         }
     }
 
-    static boolean isMobileCellSaved(DatabaseHandler instance, int mobileCell) {
+    static boolean isMobileCellSaved(DatabaseHandler instance, int mobileCell, long mobileCellLong) {
         instance.importExportLock.lock();
         try {
             int r = 0;
@@ -5401,19 +5477,28 @@ static boolean isMobileCellSaved(DatabaseHandler instance, int mobileCell) {
                 instance.startRunningCommand();
 
                 // Select All Query
-                final String selectQuery = "SELECT COUNT(*) " +
-                        " FROM " + DatabaseHandler.TABLE_MOBILE_CELLS +
-                        " WHERE " + DatabaseHandler.KEY_MC_CELL_ID + "=" + mobileCell;
-
-                //SQLiteDatabase db = this.getReadableDatabase();
-                SQLiteDatabase db = instance.getMyWritableDatabase();
+                String selectQuery = "";
+                if (mobileCell != Integer.MAX_VALUE)
+                    selectQuery = "SELECT COUNT(*) " +
+                            " FROM " + DatabaseHandler.TABLE_MOBILE_CELLS +
+                            " WHERE " + DatabaseHandler.KEY_MC_CELL_ID + "=" + mobileCell;
+                else
+                if (mobileCellLong != Long.MAX_VALUE)
+                    selectQuery = "SELECT COUNT(*) " +
+                            " FROM " + DatabaseHandler.TABLE_MOBILE_CELLS +
+                            " WHERE " + DatabaseHandler.KEY_MC_CELL_ID_LONG + "=" + mobileCellLong;
+
+                if (!selectQuery.isEmpty()) {
+                    //SQLiteDatabase db = this.getReadableDatabase();
+                    SQLiteDatabase db = instance.getMyWritableDatabase();
 
-                Cursor cursor = db.rawQuery(selectQuery, null);
+                    Cursor cursor = db.rawQuery(selectQuery, null);
 
-                if (cursor != null) {
-                    cursor.moveToFirst();
-                    r = cursor.getInt(0);
-                    cursor.close();
+                    if (cursor != null) {
+                        cursor.moveToFirst();
+                        r = cursor.getInt(0);
+                        cursor.close();
+                    }
                 }
 
                 //db.close();
@@ -5514,7 +5599,7 @@ static void deleteNonNamedNotUsedCells(DatabaseHandler instance, boolean calledF
         try {
             // load cells from db
             List<MobileCellsData> cellsList = new ArrayList<>();
-            addMobileCellsToList(instance, cellsList, 0, calledFromImportDB);
+            addMobileCellsToList(instance, cellsList, 0, 0, calledFromImportDB);
             // load events from db
             List<Event> eventList;
             eventList = getAllEvents(instance, calledFromImportDB);
@@ -5525,31 +5610,41 @@ static void deleteNonNamedNotUsedCells(DatabaseHandler instance, boolean calledF
                     for (Event event : eventList) {
                         if (event._eventPreferencesMobileCells != null) {
                             if ((event._eventPreferencesMobileCells._enabled)) {
-                                if (event._eventPreferencesMobileCells._cellsNames.contains("|" + cell.cellId + "|")) {
-                                    // cell is between others
-                                    found = true;
-                                    break;
-                                }
-                                if (event._eventPreferencesMobileCells._cellsNames.startsWith(cell.cellId + "|")) {
-                                    // cell is at start of others
-                                    found = true;
-                                    break;
-                                }
-                                if (event._eventPreferencesMobileCells._cellsNames.endsWith("|" + cell.cellId)) {
-                                    // cell is at end of others
-                                    found = true;
-                                    break;
-                                }
-                                if (event._eventPreferencesMobileCells._cellsNames.equals(String.valueOf(cell.cellId))) {
-                                    // only this cell is configured
-                                    found = true;
-                                    break;
+                                boolean cellIdAllowed = false;
+                                long cellId = cell.cellId;
+                                if (cellId == Integer.MAX_VALUE) {
+                                    cellId = cell.cellIdLong;
+                                    if (cellId != Long.MAX_VALUE)
+                                        cellIdAllowed = true;
+                                } else
+                                    cellIdAllowed = true;
+                                if (cellIdAllowed) {
+                                    if (event._eventPreferencesMobileCells._cellsNames.contains("|" + cellId + "|")) {
+                                        // cell is between others
+                                        found = true;
+                                        break;
+                                    }
+                                    if (event._eventPreferencesMobileCells._cellsNames.startsWith(cellId + "|")) {
+                                        // cell is at start of others
+                                        found = true;
+                                        break;
+                                    }
+                                    if (event._eventPreferencesMobileCells._cellsNames.endsWith("|" + cellId)) {
+                                        // cell is at end of others
+                                        found = true;
+                                        break;
+                                    }
+                                    if (event._eventPreferencesMobileCells._cellsNames.equals(String.valueOf(cellId))) {
+                                        // only this cell is configured
+                                        found = true;
+                                        break;
+                                    }
                                 }
                             }
                         }
                     }
                     if (!found) {
-                        deleteMobileCell(instance, cell.cellId, calledFromImportDB);
+                        deleteMobileCell(instance, cell.cellId, cell.cellIdLong, calledFromImportDB);
                         //cellsList.remove(cell);
                         it.remove();
                     }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerProfiles.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerProfiles.java
index fa2bf68abb..3688760c59 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerProfiles.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DatabaseHandlerProfiles.java
@@ -1663,8 +1663,8 @@ static void increaseActivationByUserCount(DatabaseHandler instance, Profile prof
             increaseActivationByUserCount(instance, profile._id);
         }
     }
-
-    static List<Profile> getProfilesForDynamicShortcuts(DatabaseHandler instance/*, boolean counted*/) {
+/*
+    static List<Profile> getProfilesForDynamicShortcuts(DatabaseHandler instance) {
         instance.importExportLock.lock();
         try {
 
@@ -1680,19 +1680,11 @@ static List<Profile> getProfilesForDynamicShortcuts(DatabaseHandler instance/*,
                                                 DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT +
                                     " FROM " + DatabaseHandler.TABLE_PROFILES;
 
-                /*if (counted) {
-                    selectQuery = selectQuery +
-                            " WHERE " + KEY_ACTIVATION_BY_USER_COUNT + "> 0" +
-                            " ORDER BY " + KEY_ACTIVATION_BY_USER_COUNT + " DESC " +
-                            " LIMIT " + "3"; // 3 shortcuts because first is restart events
-                }
-                else*/ {
-                    selectQuery = selectQuery +
-                            " WHERE " + DatabaseHandler.KEY_SHOW_IN_ACTIVATOR + "=1" +
-                            //" AND " + DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT + "= 0" +
-                            " ORDER BY " + DatabaseHandler.KEY_PORDER +
-                            " LIMIT " + "3"; // 3 shortcuts because first is restart events
-                }
+                selectQuery = selectQuery +
+                        " WHERE " + DatabaseHandler.KEY_SHOW_IN_ACTIVATOR + "=1" +
+                        //" AND " + DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT + "= 0" +
+                        " ORDER BY " + DatabaseHandler.KEY_PORDER +
+                        " LIMIT " + "3"; // 3 shortcuts because first is restart events
 
                 //SQLiteDatabase db = this.getReadableDatabase();
                 SQLiteDatabase db = instance.getMyWritableDatabase();
@@ -1751,20 +1743,6 @@ static List<Profile> getProfilesInQuickTilesForDynamicShortcuts(DatabaseHandler
                         DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT +
                         " FROM " + DatabaseHandler.TABLE_PROFILES;
 
-                /*if (counted) {
-                    selectQuery = selectQuery +
-                            //" WHERE " + DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT + "> 0" +
-                            //" ORDER BY " + DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT + " DESC " +
-                            " LIMIT " + "3"; // 3 shortcuts because first is restart events
-                }
-                else {
-                    selectQuery = selectQuery +
-                            " WHERE " + DatabaseHandler.KEY_SHOW_IN_ACTIVATOR + "=1" +
-                            " AND " + DatabaseHandler.KEY_ACTIVATION_BY_USER_COUNT + "= 0" +
-                            " ORDER BY " + DatabaseHandler.KEY_PORDER +
-                            " LIMIT " + "3"; // 3 shortcuts because first is restart events
-                }*/
-
                 //SQLiteDatabase db = this.getReadableDatabase();
                 SQLiteDatabase db = instance.getMyWritableDatabase();
 
@@ -1801,6 +1779,59 @@ static List<Profile> getProfilesInQuickTilesForDynamicShortcuts(DatabaseHandler
             instance.stopRunningCommand();
         }
     }
+*/
+    static List<Profile> getProfilesForDynamicShortcuts2(DatabaseHandler instance) {
+        instance.importExportLock.lock();
+        try {
+
+            List<Profile> profileList = new ArrayList<>();
+
+            try {
+                instance.startRunningCommand();
+
+                // Select All Query
+                String selectQuery = "SELECT " + DatabaseHandler.KEY_ID + "," +
+                        DatabaseHandler.KEY_NAME + "," +
+                        DatabaseHandler.KEY_ICON +
+                        " FROM " + DatabaseHandler.TABLE_PROFILES;
+
+                //SQLiteDatabase db = this.getReadableDatabase();
+                SQLiteDatabase db = instance.getMyWritableDatabase();
+
+                Cursor cursor = db.rawQuery(selectQuery, null);
+
+                // looping through all rows and adding to list
+                if (cursor.moveToFirst()) {
+                    do {
+                        Profile profile = new Profile();
+                        profile._id = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_ID));
+                        profile._name = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_NAME));
+                        profile._icon = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseHandler.KEY_ICON));
+                        // 4 is max. allowed count of dynamic shortcuts, first is "Restart events"
+                        int limit = 4;
+                        for (int i = 0; i < (limit-1); i++) {
+                            long inShortcutsProfileId = ApplicationPreferences.getDynamicShortcutProfileId(instance.context, i);
+                            if (inShortcutsProfileId == profile._id) {
+//                                PPApplicationStatic.logE("DatabaseHandlerProfiles.getProfilesForDynamicShortcuts2", "profile._name="+profile._name);
+                                profileList.add(profile);
+                            }
+                        }
+                    } while (cursor.moveToNext());
+                }
+
+                cursor.close();
+                //db.close();
+
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+
+            return profileList;
+
+        } finally {
+            instance.stopRunningCommand();
+        }
+    }
 
     static void updateProfileShowInActivator(DatabaseHandler instance, Profile profile) {
         instance.importExportLock.lock();
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DownloadCompletedBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DownloadCompletedBroadcastReceiver.java
new file mode 100644
index 0000000000..2f5dfe6848
--- /dev/null
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DownloadCompletedBroadcastReceiver.java
@@ -0,0 +1,61 @@
+package sk.henrichg.phoneprofilesplus;
+
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class DownloadCompletedBroadcastReceiver extends BroadcastReceiver {
+
+    //static long downloadReferencePPP = 0;
+    //static long downloadReferencePPPE = 0;
+    //static long downloadReferencePPPPS = 0;
+    //static long downloadReferenceInstallWithOptions = 0;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        /*
+        Log.e("DownloadCompletedBroadcastReceiver.onReceive", "downloadReferencePPP="+downloadReferencePPP);
+        Log.e("DownloadCompletedBroadcastReceiver.onReceive", "downloadReferencePPPE="+downloadReferencePPPE);
+        Log.e("DownloadCompletedBroadcastReceiver.onReceive", "downloadReferencePPPPS="+downloadReferencePPPPS);
+        Log.e("DownloadCompletedBroadcastReceiver.onReceive", "downloadReferenceInstallWithOptions="+downloadReferenceInstallWithOptions);
+
+        long completedDownloadReference = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0);
+        Log.e("DownloadCompletedBroadcastReceiver.onReceive", "completedDownloadReference="+completedDownloadReference);
+
+        try {
+            Uri apkFile = null;
+
+            DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+
+            if (completedDownloadReference == downloadReferencePPPPS) {
+                apkFile = downloadManager.getUriForDownloadedFile(completedDownloadReference);
+                Log.e("DownloadCompletedBroadcastReceiver.onReceive", "apkFile="+apkFile);
+            }
+
+            if (apkFile != null) //noinspection ExtractMethodRecommender
+            {
+                Intent intentDownloads = new Intent(Intent.ACTION_VIEW, apkFile);
+                //intentDownloads.setDataAndType(apkFile, downloadManager.getMimeTypeForDownloadedFile(completedDownloadReference));
+                //intentDownloads.setData(apkFile);
+                //intentDownloads.putExtra(Intent.EXTRA_STREAM, apkFile);
+                intentDownloads.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                intentDownloads.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intentDownloads);
+            }
+        } catch (Exception e) {
+            Log.e("DownloadCompletedBroadcastReceiver.onReceive", Log.getStackTraceString(e));
+        }
+        */
+
+        try {
+            Intent intentDownloads = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
+            intentDownloads.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intentDownloads);
+        } catch (Exception e) {
+            Log.e("DownloadCompletedBroadcastReceiver.onReceive", Log.getStackTraceString(e));
+        }
+    }
+
+}
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DynamicShortcutsMutex.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DynamicShortcutsMutex.java
new file mode 100644
index 0000000000..7b600f4434
--- /dev/null
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/DynamicShortcutsMutex.java
@@ -0,0 +1,4 @@
+package sk.henrichg.phoneprofilesplus;
+
+class DynamicShortcutsMutex {
+}
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorActivity.java
index 032c407fcc..0061cc9119 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorActivity.java
@@ -675,6 +675,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] EditorActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             //return true;
@@ -936,6 +937,14 @@ public boolean onPrepareOptionsMenu(Menu menu) {
             else
                 menuItem.setTitle(R.string.menu_check_releases_droidify);
         }
+        menuItem = menu.findItem(R.id.menu_check_in_neostore);
+        if (menuItem != null) {
+            Intent intent = packageManager.getLaunchIntentForPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+            if (intent != null)
+                menuItem.setTitle(StringConstants.CHAR_ARROW +" " + getString(R.string.menu_check_releases_neostore));
+            else
+                menuItem.setTitle(R.string.menu_check_releases_neostore);
+        }
         menuItem = menu.findItem(R.id.menu_check_in_fdroid);
         if (menuItem != null) {
             Intent intent = packageManager.getLaunchIntentForPackage(PPApplication.FDROID_PACKAGE_NAME);
@@ -1080,6 +1089,26 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         //    menuItem.setVisible(PPApplication.deviceIsHuawei && PPApplication.romIsEMUI && appGalleryInstalled);
         //}
 
+        menuItem = menu.findItem(R.id.menu_discord);
+        if (menuItem != null)
+        {
+            SubMenu subMenu = menuItem.getSubMenu();
+            if (subMenu != null) {
+                Drawable triangle = ContextCompat.getDrawable(this, R.drawable.ic_submenu_triangle);
+                if (triangle != null) {
+                    triangle.setTint(ContextCompat.getColor(this, R.color.activitySecondaryTextColor));
+                    SpannableString headerTitle = new SpannableString("    " + menuItem.getTitle());
+                    triangle.setBounds(0,
+                            GlobalGUIRoutines.sip(1),
+                            GlobalGUIRoutines.sip(10.5f),
+                            GlobalGUIRoutines.sip(8.5f));
+                    headerTitle.setSpan(new ImageSpan(triangle, ImageSpan.ALIGN_BASELINE), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    //headerTitle.setSpan(new ImageSpan(this, R.drawable.ic_submenu_triangle, DynamicDrawableSpan.ALIGN_BASELINE), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    subMenu.setHeaderTitle(headerTitle);
+                }
+            }
+        }
+
         onNextLayout(editorToolbar, this::showTargetHelps);
 
         return ret;
@@ -1347,8 +1376,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         if ((itemId == R.id.menu_check_in_github) ||
                 (itemId == R.id.menu_check_in_fdroid) ||
                 (itemId == R.id.menu_check_in_droidify) ||
-//                (itemId == R.id.menu_check_in_galaxy_store) ||
-//                (itemId == R.id.menu_check_in_amazon_appstore) ||
+                (itemId == R.id.menu_check_in_neostore) ||
                 (itemId == R.id.menu_check_in_appgallery) ||
                 (itemId == R.id.menu_check_in_apkpure)) {
 
@@ -1375,6 +1403,128 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return true;
         }
         else
+        if (itemId == R.id.menu_xda_developers) {
+            String url = PPApplication.XDA_DEVELOPERS_PPP_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_discord_server) {
+            String url = PPApplication.DISCORD_SERVER_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_discord_invitation) {
+            String url = PPApplication.DISCORD_INVITATION_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        /*
+        else
+        if (itemId == R.id.menu_discord_discussion) {
+            String url = PPApplication.DISCORD_DISCUSSIION_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_discord_help) {
+            String url = PPApplication.DISCORD_HELP_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_discord_bugs) {
+            String url = PPApplication.DISCORD_BUGS_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_discord_suggestions) {
+            String url = PPApplication.DISCORD_SUGGESTIONS_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        */
+        else
+        if (itemId == R.id.menu_twitter) {
+            String url = PPApplication.TWITTER_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_reddit) {
+            String url = PPApplication.REDDIT_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
+        if (itemId == R.id.menu_bluesky) {
+            String url = PPApplication.BLUESKY_URL;
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            try {
+                startActivity(Intent.createChooser(intent, getString(R.string.web_browser_chooser)));
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+            return true;
+        }
+        else
         if (DebugVersion.debugMenuItems(itemId, this))
             return true;
         else
@@ -1432,7 +1582,6 @@ private boolean selectViewItem(int item) {
             final Handler handler = new Handler(getMainLooper());
             final WeakReference<EditorActivity> activityWeakRef = new WeakReference<>(this);
             handler.postDelayed(() -> {
-                //noinspection ConstantValue
                 EditorActivity activity = activityWeakRef.get();
                 if ((activity == null) || activity.isFinishing() || activity.isDestroyed())
                     return;
@@ -1462,7 +1611,6 @@ private boolean selectViewItem(int item) {
             final Handler handler = new Handler(getMainLooper());
             final WeakReference<EditorActivity> activityWeakRef = new WeakReference<>(this);
             handler.postDelayed(() -> {
-                //noinspection ConstantValue
                 EditorActivity activity = activityWeakRef.get();
                 if ((activity == null) || activity.isFinishing() || activity.isDestroyed())
                     return;
@@ -2968,7 +3116,7 @@ void redrawProfileListFragment(Profile profile, int newProfileMode /*int predefi
 //                PPApplicationStatic.logE("[PPP_NOTIFICATION] EditorActivity.redrawProfileListFragment", "call of updateGUI");
                 PPApplication.updateGUI(true, false, fragment.activityDataWrapper.context);
 
-                DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(getApplicationContext());
+                DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(getApplicationContext(), false);
 
                 if (filterProfilesSelectedItem != 0) {
                     final Handler handler = new Handler(getMainLooper());
@@ -4465,6 +4613,7 @@ protected void onPostExecute(Integer result) {
                     serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
                     serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
                     serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+                    serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //                    PPApplicationStatic.logE("[START_PP_SERVICE] EditorActivity.doImportData", "xxx");
                     PPApplicationStatic.startPPService(activity, serviceIntent, true);
                 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorEventListFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorEventListFragment.java
index 6ffe7e35bb..de453af1b5 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorEventListFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorEventListFragment.java
@@ -174,6 +174,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         //getActivity().getIntent();
 
+        //noinspection deprecation
         setHasOptionsMenu(true);
 
     }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorProfileListFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorProfileListFragment.java
index 836cc9c799..ad862896ae 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorProfileListFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EditorProfileListFragment.java
@@ -141,6 +141,7 @@ public void onCreate(Bundle savedInstanceState) {
         activityDataWrapper = new DataWrapper(getActivity().getApplicationContext(), false, 0, false, DataWrapper.IT_FOR_EDITOR, 0, 0f);
         //loadAsyncTask = new LoadProfileListAsyncTask(this, filterType);
 
+        //noinspection deprecation
         setHasOptionsMenu(true);
 
     }
@@ -711,7 +712,7 @@ private void deleteProfile(Profile profile)
             activityDataWrapper.restartEventsWithRescan(true, false, true, true, true, false);
         }
 
-        DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(activityDataWrapper.context);
+        DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(activityDataWrapper.context, false);
 
         /*Intent serviceIntent = new Intent(getActivity().getApplicationContext(), PhoneProfilesService.class);
         serviceIntent.putExtra(PhoneProfilesService.EXTRA_ONLY_START, false);
@@ -869,7 +870,7 @@ private void deleteAllProfiles()
 //                PPApplicationStatic.logE("[PPP_NOTIFICATION] EditorProfileListFragment.deleteAllProfiles", "call of updateGUI");
                         PPApplication.updateGUI(true, false, activityDataWrapper.context);
 
-                        DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(activityDataWrapper.context);
+                        DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(activityDataWrapper.context, false);
 
                         /*Intent serviceIntent = new Intent(activityDataWrapper.context, PhoneProfilesService.class);
                         serviceIntent.putExtra(PhoneProfilesService.EXTRA_ONLY_START, false);
@@ -986,7 +987,7 @@ public void doOnActivityResult(int requestCode, int resultCode, Intent data)
                     profileListAdapter.activateProfile(profile);
                 updateHeader(profile);
 
-                DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(activityDataWrapper.context);
+                DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(activityDataWrapper.context, true);
 
              }
              //if (resultCode == Activity.RESULT_CANCELED)
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Event.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Event.java
index 8d1d99cf9c..7c3a966e21 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Event.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Event.java
@@ -662,7 +662,7 @@ boolean isEnabledSomeSensor(Context context) {
     boolean isRunnable(Context context, boolean checkSomeSensorEnabled) {
         Context appContext = context.getApplicationContext();
 
-        boolean runnable = true; //(this._fkProfileStart != 0) && (this._fkProfileEnd != 0);
+        boolean runnable = true;
         if (checkSomeSensorEnabled) {
             boolean someEnabled = isEnabledSomeSensor(appContext);
             if (!someEnabled)
@@ -724,6 +724,71 @@ boolean isRunnable(Context context, boolean checkSomeSensorEnabled) {
         return runnable;
     }
 
+    boolean isAllConfigured(Context context, boolean checkSomeSensorEnabled) {
+        Context appContext = context.getApplicationContext();
+
+        boolean isAllConfigured = true;
+        if (checkSomeSensorEnabled) {
+            boolean someEnabled = isEnabledSomeSensor(appContext);
+            if (!someEnabled)
+                isAllConfigured = false;
+        }
+        if (this._eventPreferencesTime._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesTime.isAllConfigured(appContext);
+        if (this._eventPreferencesBattery._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesBattery.isAllConfigured(appContext);
+        if (this._eventPreferencesCall._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesCall.isAllConfigured(appContext);
+        if (this._eventPreferencesAccessories._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesAccessories.isAllConfigured(appContext);
+        if (this._eventPreferencesCalendar._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesCalendar.isAllConfigured(appContext);
+        if (this._eventPreferencesWifi._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesWifi.isAllConfigured(appContext);
+        if (this._eventPreferencesScreen._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesScreen.isAllConfigured(appContext);
+        if (this._eventPreferencesBrightness._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesBrightness.isAllConfigured(appContext);
+        if (this._eventPreferencesBluetooth._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesBluetooth.isAllConfigured(appContext);
+        if (this._eventPreferencesSMS._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesSMS.isAllConfigured(appContext);
+        if (this._eventPreferencesNotification._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesNotification.isAllConfigured(appContext);
+        if (this._eventPreferencesApplication._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesApplication.isAllConfigured(appContext);
+        if (this._eventPreferencesLocation._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesLocation.isAllConfigured(appContext);
+        if (this._eventPreferencesOrientation._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesOrientation.isAllConfigured(appContext);
+        if (this._eventPreferencesMobileCells._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesMobileCells.isAllConfigured(appContext);
+        if (this._eventPreferencesNFC._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesNFC.isAllConfigured(appContext);
+        if (this._eventPreferencesRadioSwitch._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesRadioSwitch.isAllConfigured(appContext);
+        if (this._eventPreferencesAlarmClock._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesAlarmClock.isAllConfigured(appContext);
+        if (this._eventPreferencesDeviceBoot._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesDeviceBoot.isAllConfigured(appContext);
+        if (this._eventPreferencesSoundProfile._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesSoundProfile.isAllConfigured(appContext);
+        if (this._eventPreferencesPeriodic._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesPeriodic.isAllConfigured(appContext);
+        if (this._eventPreferencesVolumes._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesVolumes.isAllConfigured(appContext);
+        if (this._eventPreferencesActivatedProfile._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesActivatedProfile.isAllConfigured(appContext);
+        if (this._eventPreferencesRoaming._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesRoaming.isAllConfigured(appContext);
+        if (this._eventPreferencesVPN._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesVPN.isAllConfigured(appContext);
+        if (this._eventPreferencesMusic._enabled)
+            isAllConfigured = isAllConfigured && this._eventPreferencesMusic.isAllConfigured(appContext);
+
+        return isAllConfigured;
+    }
+
     int isAccessibilityServiceEnabled(Context context, boolean checkSomeSensorEnabled, boolean againCheckInDelay) {
         int accessibilityEnabled = 1;
         boolean someEnabled = true;
@@ -940,7 +1005,7 @@ void saveSharedPreferences(SharedPreferences preferences, Context context)
         this._eventPreferencesVPN.saveSharedPreferences(preferences);
         this._eventPreferencesMusic.saveSharedPreferences(preferences);
 
-        if (!this.isRunnable(context, true))
+        if (!(this.isRunnable(context, true) && this.isAllConfigured(context, true)))
             this._status = ESTATUS_STOP;
     }
 
@@ -1515,6 +1580,7 @@ String getPreferencesDescription(Context context, DataWrapper _dataWrapper, bool
         StringBuilder _value = new StringBuilder();
 
         if (ApplicationPreferences.applicationEventUsePriority) {
+            // This is pseudo sensor [Priority], this sensor do have notAllowed status
             String passStatusString;
             if (EventStatic.getGlobalEventsRunning(context) && addPassStatus && (getStatusFromDB(context) != Event.ESTATUS_STOP)) {
                 int sensorPassed = EventPreferences.SENSOR_PASSED_PASSED;
@@ -1832,7 +1898,7 @@ void startEvent(DataWrapper dataWrapper,
             // events are globally stopped
             return;
 
-        if (!this.isRunnable(dataWrapper.context, true)) {
+        if (!(this.isRunnable(dataWrapper.context, true) && this.isAllConfigured(dataWrapper.context, true))) {
             // event is not runnable, no start it
             return;
         }
@@ -2261,7 +2327,7 @@ void pauseEvent(DataWrapper dataWrapper,
             // events are globally stopped
             return;
 
-        if (!this.isRunnable(dataWrapper.context, true))
+        if (!(this.isRunnable(dataWrapper.context, true) && this.isAllConfigured(dataWrapper.context, true)))
             // event is not runnable, no pause it
             return;
 
@@ -2575,7 +2641,7 @@ void setDelayStartAlarm(DataWrapper dataWrapper)
             // events are globally stopped
             return;
 
-        if (!this.isRunnable(dataWrapper.context, true))
+        if (!(this.isRunnable(dataWrapper.context, true) && this.isAllConfigured(dataWrapper.context, true)))
             // event is not runnable, no pause it
             return;
 
@@ -2794,7 +2860,7 @@ void setDelayEndAlarm(DataWrapper dataWrapper, boolean forRestartEvents)
             // events are globally stopped
             return;
 
-        if (!this.isRunnable(dataWrapper.context, true))
+        if (!(this.isRunnable(dataWrapper.context, true) && this.isAllConfigured(dataWrapper.context, true)))
             // event is not runnable, no pause it
             return;
 
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferences.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferences.java
index 60f4662e71..9e6d0cd134 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferences.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferences.java
@@ -42,6 +42,11 @@ int isAccessibilityServiceEnabled(Context context, boolean againCheckInDelay)
         return 1;
     }
 
+    boolean isAllConfigured(Context context)
+    {
+        return true;
+    }
+
     /*
     boolean activateReturnProfile()
     {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAccessories.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAccessories.java
index 5a0af4b6fd..c3cb00a7d9 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAccessories.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAccessories.java
@@ -223,7 +223,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_ACCESSORIES).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context)&& permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesActivatedProfile.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesActivatedProfile.java
index 93897557ca..d184365d67 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesActivatedProfile.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesActivatedProfile.java
@@ -137,6 +137,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesActivatedProfile.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesActivatedProfile.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesActivatedProfile.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_ACTIVATED_PROFILE_ENABLED, false);
         ProfilePreference preference = prefMng.findPreference(PREF_EVENT_ACTIVATED_PROFILE_START_PROFILE);
         if (preference != null) {
@@ -189,7 +190,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_ACTIVATED_PROFILE).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAlarmClock.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAlarmClock.java
index e80c7f3ca3..04d842c2b8 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAlarmClock.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesAlarmClock.java
@@ -172,6 +172,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesAlarmClock.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesAlarmClock.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesAlarmClock.isAllConfigured(context);;
         boolean enabled = preferences.getBoolean(PREF_EVENT_ALARM_CLOCK_ENABLED, false);
         Preference applicationsPreference = prefMng.findPreference(PREF_EVENT_ALARM_CLOCK_APPLICATIONS);
         if (applicationsPreference != null) {
@@ -244,7 +245,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_ALARM_CLOCK).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -315,7 +316,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesApplication.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesApplication.java
index 07e5acb47f..9bd24dfd9d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesApplication.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesApplication.java
@@ -201,6 +201,7 @@ private void setSummary(PreferenceManager prefMng, String key/*, String value*/,
         event.createEventPreferences();
         event._eventPreferencesApplication.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesApplication.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesApplication.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_APPLICATION_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_APPLICATION_APPLICATIONS);
         if (preference != null) {
@@ -287,7 +288,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
             Preference preference = prefMng.findPreference(PREF_EVENT_APPLICATION_CATEGORY);
             if (preference != null) {
                 boolean enabled = tmp._enabled; //(preferences != null) && preferences.getBoolean(PREF_EVENT_APPLICATION_ENABLED, false);
-                boolean runnable = tmp.isRunnable(context) &&
+                boolean runnable = tmp.isRunnable(context) && tmp.isAllConfigured(context) &&
                         (tmp.isAccessibilityServiceEnabled(context, false) == 1) &&
                         (PPApplication.accessibilityServiceForPPPExtenderConnected == 1);
                 boolean permissionGranted = true;
@@ -328,7 +329,7 @@ int isAccessibilityServiceEnabled(Context context, boolean againCheckInDelay)
             return -2;
         if (extenderVersion < PPApplication.VERSION_CODE_EXTENDER_8_1_3)
             return -1;
-        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled && isRunnable(context)) {
+        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled && isRunnable(context) && isAllConfigured(context)) {
             if (PPExtenderBroadcastReceiver.isAccessibilityServiceEnabled(context, againCheckInDelay, true
                         /*, "EventPreferencesApplication.isAccessibilityServiceEnabled"*/))
                 return 1;
@@ -408,7 +409,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBattery.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBattery.java
index 983b33b341..8a555a87b2 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBattery.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBattery.java
@@ -301,7 +301,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_BATTERY).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBluetooth.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBluetooth.java
index 72e3b065ca..31fa485168 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBluetooth.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBluetooth.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.os.Build;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.CharacterStyle;
@@ -98,6 +99,7 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                     _value.append(StringConstants.TAG_BOLD_END_WITH_SPACE_HTML);
                 }
 
+                boolean locationErrorDisplayed = false;
                 if ((this._connectionType == 1) || (this._connectionType == 3)) {
                     if (!ApplicationPreferences.applicationEventBluetoothEnableScanning) {
                         if (!ApplicationPreferences.applicationEventBluetoothDisabledScannigByProfile)
@@ -106,6 +108,7 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                             _value.append(context.getString(R.string.phone_profiles_pref_applicationEventScanningDisabledByProfile)).append(StringConstants.TAG_BREAK_HTML);
                     } else if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
                         _value.append("* ").append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append("! *").append(StringConstants.TAG_BREAK_HTML);
+                        locationErrorDisplayed = true;
                     } else {
                         boolean scanningPaused = ApplicationPreferences.applicationEventBluetoothScanInTimeMultiply.equals("2") &&
                                 GlobalUtils.isNowTimeBetweenTimes(
@@ -115,6 +118,11 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                             _value.append(context.getString(R.string.phone_profiles_pref_applicationEventScanningPaused)).append(StringConstants.TAG_BREAK_HTML);
                         }
                     }
+                    if (Build.VERSION.SDK_INT >= 29) {
+                        if ((!locationErrorDisplayed) && (!GlobalUtils.isLocationEnabled(context.getApplicationContext()))) {
+                            _value.append("* ").append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append("! *").append(StringConstants.TAG_BREAK_HTML);
+                        }
+                    }
                 }
 
                 String[] connectionListTypes = context.getResources().getStringArray(R.array.eventBluetoothConnectionTypeValues);
@@ -254,18 +262,44 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
                 preference.setSummary(summary);
             }
         }
-        if (key.equals(PREF_EVENT_BLUETOOTH_LOCATION_SYSTEM_SETTINGS)) {
-            Preference preference = prefMng.findPreference(key);
+        if (key.equals(PREF_EVENT_BLUETOOTH_ENABLED) ||
+            key.equals(PREF_EVENT_BLUETOOTH_LOCATION_SYSTEM_SETTINGS)) {
+            Preference preference = prefMng.findPreference(PREF_EVENT_BLUETOOTH_LOCATION_SYSTEM_SETTINGS);
             if (preference != null) {
                 String summary = context.getString(R.string.phone_profiles_pref_eventBluetoothLocationSystemSettings_summary);
+                int titleColor;
                 if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
-                    summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *"+StringConstants.STR_DOUBLE_NEWLINE +
+                    int connectionType = Integer.parseInt(preferences.getString(PREF_EVENT_BLUETOOTH_CONNECTION_TYPE, "1"));
+                    if ((connectionType == 1) || (connectionType == 3)) {
+                        summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *" + StringConstants.STR_DOUBLE_NEWLINE +
+                                summary;
+                        titleColor = ContextCompat.getColor(context, R.color.error_color);
+                    }
+                    else {
+                        summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + StringConstants.STR_DOUBLE_NEWLINE +
+                                summary;
+                        titleColor = 0;
+                    }
+                } else {
+                    summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsEnabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT +
                             summary;
+                    titleColor = 0;
                 }
-                else {
-                    summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsEnabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT+
-                            summary;
+                CharSequence sTitle = preference.getTitle();
+                int titleLenght = 0;
+                if (sTitle != null)
+                    titleLenght = sTitle.length();
+                Spannable sbt = new SpannableString(sTitle);
+                Object[] spansToRemove = sbt.getSpans(0, titleLenght, Object.class);
+                for(Object span: spansToRemove){
+                    if(span instanceof CharacterStyle)
+                        sbt.removeSpan(span);
                 }
+                if (preferences.getBoolean(PREF_EVENT_BLUETOOTH_ENABLED, false)) {
+                    if (titleColor != 0)
+                        sbt.setSpan(new ForegroundColorSpan(titleColor), 0, sbt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+                preference.setTitle(sbt);
                 preference.setSummary(summary);
             }
         }
@@ -341,6 +375,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesBluetooth.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesBluetooth.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesBluetooth.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_BLUETOOTH_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_BLUETOOTH_ADAPTER_NAME);
         if (preference != null) {
@@ -411,7 +446,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_BLUETOOTH_SCANNER).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -434,6 +469,25 @@ boolean isRunnable(Context context)
         return super.isRunnable(context) && (!this._adapterName.isEmpty());
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        if ((this._connectionType == 1) || (this._connectionType == 3)) {
+            allConfigured = allConfigured &&
+                    (ApplicationPreferences.applicationEventBluetoothEnableScanning ||
+                     ApplicationPreferences.applicationEventBluetoothDisabledScannigByProfile);
+        }
+
+        if (Build.VERSION.SDK_INT >= 29) {
+            if ((this._connectionType == 1) || (this._connectionType == 3))
+                allConfigured = allConfigured && GlobalUtils.isLocationEnabled(context.getApplicationContext());
+        }
+
+        return allConfigured;
+    }
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
@@ -569,48 +623,50 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                             //    notAllowedBluetooth = true;
                             eventsHandler.bluetoothPassed = false;
                         } else {
-                            //PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                            if (!PPApplication.isScreenOn && ApplicationPreferences.applicationEventBluetoothScanOnlyWhenScreenIsOn) {
-                                if (forRestartEvents)
-                                    eventsHandler.bluetoothPassed = (EventPreferences.SENSOR_PASSED_PASSED & getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
-                                else
-                                    // not allowed for screen Off
-                                    eventsHandler.notAllowedBluetooth = true;
-                            } else {
-                                eventsHandler.bluetoothPassed = false;
-
-                                boolean scanningPaused = ApplicationPreferences.applicationEventBluetoothScanInTimeMultiply.equals("2") &&
-                                        GlobalUtils.isNowTimeBetweenTimes(
-                                                ApplicationPreferences.applicationEventBluetoothScanInTimeMultiplyFrom,
-                                                ApplicationPreferences.applicationEventBluetoothScanInTimeMultiplyTo);
-
-                                if (!scanningPaused) {
-                                    List<BluetoothDeviceData> scanResults = BluetoothScanWorker.getScanResults(eventsHandler.context);
-
-                                    if (scanResults != null) {
-                                        for (BluetoothDeviceData device : scanResults) {
-                                            String[] splits = _adapterName.split(StringConstants.STR_SPLIT_REGEX);
-                                            boolean[] nearby = new boolean[splits.length];
-                                            int i = 0;
-                                            for (String _bluetoothName : splits) {
-                                                nearby[i] = false;
-                                                switch (_bluetoothName) {
-                                                    case EventPreferencesBluetooth.ALL_BLUETOOTH_NAMES_VALUE:
-                                                        nearby[i] = true;
-                                                        break;
-                                                    case EventPreferencesBluetooth.CONFIGURED_BLUETOOTH_NAMES_VALUE:
-                                                        for (BluetoothDeviceData data : boundedDevicesList) {
-                                                            String _device = device.getName().toUpperCase();
-                                                            String _adapterName = data.getName().toUpperCase();
-                                                            if ((!_device.isEmpty()) &&
-                                                                    (!_adapterName.isEmpty()) &&
-                                                                    Wildcard.match(_device, _adapterName, '_', '%', true)) {
-                                                                nearby[i] = true;
-                                                                break;
+                            if (GlobalUtils.isLocationEnabled(eventsHandler.context)) {
+
+                                //PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+                                if (!PPApplication.isScreenOn && ApplicationPreferences.applicationEventBluetoothScanOnlyWhenScreenIsOn) {
+                                    if (forRestartEvents)
+                                        eventsHandler.bluetoothPassed = (EventPreferences.SENSOR_PASSED_PASSED & getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
+                                    else
+                                        // not allowed for screen Off
+                                        eventsHandler.notAllowedBluetooth = true;
+                                } else {
+                                    eventsHandler.bluetoothPassed = false;
+
+                                    boolean scanningPaused = ApplicationPreferences.applicationEventBluetoothScanInTimeMultiply.equals("2") &&
+                                            GlobalUtils.isNowTimeBetweenTimes(
+                                                    ApplicationPreferences.applicationEventBluetoothScanInTimeMultiplyFrom,
+                                                    ApplicationPreferences.applicationEventBluetoothScanInTimeMultiplyTo);
+
+                                    if (!scanningPaused) {
+                                        List<BluetoothDeviceData> scanResults = BluetoothScanWorker.getScanResults(eventsHandler.context);
+
+                                        if (scanResults != null) {
+                                            for (BluetoothDeviceData device : scanResults) {
+                                                String[] splits = _adapterName.split(StringConstants.STR_SPLIT_REGEX);
+                                                boolean[] nearby = new boolean[splits.length];
+                                                int i = 0;
+                                                for (String _bluetoothName : splits) {
+                                                    nearby[i] = false;
+                                                    switch (_bluetoothName) {
+                                                        case EventPreferencesBluetooth.ALL_BLUETOOTH_NAMES_VALUE:
+                                                            nearby[i] = true;
+                                                            break;
+                                                        case EventPreferencesBluetooth.CONFIGURED_BLUETOOTH_NAMES_VALUE:
+                                                            for (BluetoothDeviceData data : boundedDevicesList) {
+                                                                String _device = device.getName().toUpperCase();
+                                                                String _adapterName = data.getName().toUpperCase();
+                                                                if ((!_device.isEmpty()) &&
+                                                                        (!_adapterName.isEmpty()) &&
+                                                                        Wildcard.match(_device, _adapterName, '_', '%', true)) {
+                                                                    nearby[i] = true;
+                                                                    break;
+                                                                }
                                                             }
-                                                        }
-                                                        break;
-                                                    default:
+                                                            break;
+                                                        default:
                                                         /* Removed, hidden BT are not supported
                                                         if ((device.getName() == null) || device.getName().isEmpty()) {
                                                             // scanned device has not name (hidden BT?)
@@ -627,7 +683,8 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                                                                     }
                                                                 }
                                                             }
-                                                        } else*/ {
+                                                        } else*/
+                                                        {
                                                             String _deviceName = device.getName().toUpperCase();
                                                             String _adapterName = _bluetoothName.toUpperCase();
                                                             if ((!_adapterName.isEmpty()) &&
@@ -637,45 +694,47 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                                                             }
                                                         }
                                                         break;
+                                                    }
+                                                    i++;
                                                 }
-                                                i++;
-                                            }
 
-                                            //noinspection ConstantConditions
-                                            done = false;
-                                            if (_connectionType == EventPreferencesBluetooth.CTYPE_NOT_NEARBY) {
-                                                eventsHandler.bluetoothPassed = true;
-                                                for (boolean inF : nearby) {
-                                                    if (inF) {
-                                                        done = true;
-                                                        eventsHandler.bluetoothPassed = false;
-                                                        break;
+                                                //noinspection ConstantConditions
+                                                done = false;
+                                                if (_connectionType == EventPreferencesBluetooth.CTYPE_NOT_NEARBY) {
+                                                    eventsHandler.bluetoothPassed = true;
+                                                    for (boolean inF : nearby) {
+                                                        if (inF) {
+                                                            done = true;
+                                                            eventsHandler.bluetoothPassed = false;
+                                                            break;
+                                                        }
                                                     }
-                                                }
-                                            } else {
-                                                eventsHandler.bluetoothPassed = false;
-                                                for (boolean inF : nearby) {
-                                                    if (inF) {
-                                                        done = true;
-                                                        eventsHandler.bluetoothPassed = true;
-                                                        break;
+                                                } else {
+                                                    eventsHandler.bluetoothPassed = false;
+                                                    for (boolean inF : nearby) {
+                                                        if (inF) {
+                                                            done = true;
+                                                            eventsHandler.bluetoothPassed = true;
+                                                            break;
+                                                        }
                                                     }
                                                 }
+                                                if (done)
+                                                    break;
                                             }
-                                            if (done)
-                                                break;
-                                        }
 
-                                        if (!done) {
-                                            if (scanResults.isEmpty()) {
-                                                if (_connectionType == EventPreferencesBluetooth.CTYPE_NOT_NEARBY)
-                                                    eventsHandler.bluetoothPassed = true;
+                                            if (!done) {
+                                                if (scanResults.isEmpty()) {
+                                                    if (_connectionType == EventPreferencesBluetooth.CTYPE_NOT_NEARBY)
+                                                        eventsHandler.bluetoothPassed = true;
+                                                }
                                             }
-                                        }
 
+                                        }
                                     }
                                 }
-                            }
+                            } else
+                                eventsHandler.bluetoothPassed = false;
                         }
                     }
                 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBrightness.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBrightness.java
index d853768808..d1ca60fba9 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBrightness.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesBrightness.java
@@ -194,7 +194,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_BRIGHTNESS).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCalendar.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCalendar.java
index 438ec7861e..1eca16f6bf 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCalendar.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCalendar.java
@@ -382,6 +382,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesCalendar.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesCalendar.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesCalendar.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_CALENDAR_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_CALENDAR_CALENDARS);
         if (preference != null) {
@@ -475,7 +476,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_CALENDAR).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -563,7 +564,7 @@ void setSystemEventForStart(Context context)
 
         //searchEvent(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(/*true,*/ 0, context, true);
@@ -587,7 +588,7 @@ void setSystemEventForPause(Context context)
 
         //searchEvent(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(/*false,*/ 0, context, true);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCall.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCall.java
index b682404939..fa28212bba 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCall.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesCall.java
@@ -369,6 +369,7 @@ else if (!hasSIMCard) {
         event.createEventPreferences();
         event._eventPreferencesCall.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesCall.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesCall.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_CALL_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_CALL_CONTACT_GROUPS);
         if (preference != null) {
@@ -470,7 +471,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
             Preference preference = prefMng.findPreference(PREF_EVENT_CALL_CATEGORY);
             if (preference != null) {
                 boolean enabled = tmp._enabled; //(preferences != null) && preferences.getBoolean(PREF_EVENT_CALL_ENABLED, false);
-                boolean runnable = tmp.isRunnable(context) &&
+                boolean runnable = tmp.isRunnable(context) && tmp.isAllConfigured(context) &&
                         (tmp.isAccessibilityServiceEnabled(context, false) == 1) &&
                         (PPApplication.accessibilityServiceForPPPExtenderConnected == 1);
                 boolean permissionGranted = true;
@@ -511,7 +512,8 @@ int isAccessibilityServiceEnabled(Context context, boolean againCheckInDelay)
             return -2;
         if (extenderVersion < PPApplication.VERSION_CODE_EXTENDER_8_1_3)
             return -1;
-        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled && isRunnable(context)) {
+        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled &&
+                isRunnable(context) && isAllConfigured(context)) {
             if (PPExtenderBroadcastReceiver.isAccessibilityServiceEnabled(context, againCheckInDelay, true
                             /*, "EventPreferencesCall.isAccessibilityServiceEnabled"*/))
                 return 1;
@@ -615,7 +617,7 @@ void setSystemEventForPause(Context context) {
 
         removeRunAfterCallEndAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         if ((_callEvent == CALL_EVENT_MISSED_CALL) ||
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesDeviceBoot.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesDeviceBoot.java
index d802e2d1e5..6a264f7ef1 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesDeviceBoot.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesDeviceBoot.java
@@ -164,7 +164,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_DEVICE_BOOT).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -236,7 +236,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesLocation.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesLocation.java
index c7f4f32e20..247c9d8f50 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesLocation.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesLocation.java
@@ -200,15 +200,33 @@ private void setSummary(PreferenceManager prefMng, String key/*, String value*/,
         if (key.equals(PREF_EVENT_LOCATION_LOCATION_SYSTEM_SETTINGS)) {
             Preference preference = prefMng.findPreference(key);
             if (preference != null) {
+                int titleColor;
                 String summary = context.getString(R.string.phone_profiles_pref_eventLocationSystemSettings_summary);
                 if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
                     summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *"+StringConstants.STR_DOUBLE_NEWLINE +
                             summary;
+                    titleColor = ContextCompat.getColor(context, R.color.error_color);
                 }
                 else {
                     summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsEnabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT+
                             summary;
+                    titleColor = 0;
+                }
+                CharSequence sTitle = preference.getTitle();
+                int titleLenght = 0;
+                if (sTitle != null)
+                    titleLenght = sTitle.length();
+                Spannable sbt = new SpannableString(sTitle);
+                Object[] spansToRemove = sbt.getSpans(0, titleLenght, Object.class);
+                for(Object span: spansToRemove){
+                    if(span instanceof CharacterStyle)
+                        sbt.removeSpan(span);
                 }
+                if (preferences.getBoolean(PREF_EVENT_LOCATION_ENABLED, false)) {
+                    if (titleColor != 0)
+                        sbt.setSpan(new ForegroundColorSpan(titleColor), 0, sbt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+                preference.setTitle(sbt);
                 preference.setSummary(summary);
             }
         }
@@ -223,6 +241,7 @@ private void setSummary(PreferenceManager prefMng, String key/*, String value*/,
         event.createEventPreferences();
         event._eventPreferencesLocation.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesLocation.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesLocation.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_LOCATION_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_LOCATION_GEOFENCES);
         if (preference != null) {
@@ -275,7 +294,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_LOCATION_SCANNER).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -303,6 +322,20 @@ boolean isRunnable(Context context)
         return runnable;
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        allConfigured = allConfigured &&
+                (ApplicationPreferences.applicationEventLocationEnableScanning ||
+                        ApplicationPreferences.applicationEventLocationDisabledScannigByProfile);
+
+        allConfigured = allConfigured && GlobalUtils.isLocationEnabled(context.getApplicationContext());
+
+        return allConfigured;
+    }
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMobileCells.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMobileCells.java
index 844f8fa9da..64797b3c63 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMobileCells.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMobileCells.java
@@ -94,6 +94,7 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
             PreferenceAllowed preferenceAllowed = EventStatic.isEventPreferenceAllowed(PREF_EVENT_MOBILE_CELLS_ENABLED, context);
             if (preferenceAllowed.allowed == PreferenceAllowed.PREFERENCE_ALLOWED)
             {
+                boolean locationErrorDisplayed = false;
                 if (!ApplicationPreferences.applicationEventMobileCellEnableScanning) {
 //                    PPApplicationStatic.logE("[TEST BATTERY] EventPreferencesMobileCells.getPreferencesDescription", "******** ### *******");
                     if (!ApplicationPreferences.applicationEventMobileCellDisabledScannigByProfile)
@@ -107,6 +108,7 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                         _value.append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append(".").append(StringConstants.TAG_BREAK_HTML);
                     else
                         _value.append("* ").append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append("! *").append(StringConstants.TAG_BREAK_HTML);
+                    locationErrorDisplayed = true;
                 } else {
                     boolean scanningPaused = ApplicationPreferences.applicationEventMobileCellScanInTimeMultiply.equals("2") &&
                             GlobalUtils.isNowTimeBetweenTimes(
@@ -116,6 +118,11 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                         _value.append(context.getString(R.string.phone_profiles_pref_applicationEventScanningPaused)).append(StringConstants.TAG_BREAK_HTML);
                     }
                 }
+                if (Build.VERSION.SDK_INT >= 28) {
+                    if ((!locationErrorDisplayed) && (!GlobalUtils.isLocationEnabled(context.getApplicationContext()))) {
+                        _value.append("* ").append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append("! *").append(StringConstants.TAG_BREAK_HTML);
+                    }
+                }
 
                 _value.append(context.getString(R.string.event_preferences_mobile_cells_cellNames)).append(StringConstants.STR_COLON_WITH_SPACE).append(StringConstants.TAG_BOLD_START_HTML).append(getColorForChangedPreferenceValue(MobileCellNamesPreference.getSummary(this._cellsNames, context), disabled, context)).append(StringConstants.TAG_BOLD_END_HTML);
                 if (this._whenOutside)
@@ -216,24 +223,46 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
                 preference.setSummary(summary);
             }
         }
-        if (key.equals(PREF_EVENT_MOBILE_CELLS_LOCATION_SYSTEM_SETTINGS)) {
-            Preference preference = prefMng.findPreference(key);
+        if (key.equals(PREF_EVENT_MOBILE_CELLS_ENABLED) ||
+            key.equals(PREF_EVENT_MOBILE_CELLS_LOCATION_SYSTEM_SETTINGS)) {
+            Preference preference = prefMng.findPreference(PREF_EVENT_MOBILE_CELLS_LOCATION_SYSTEM_SETTINGS);
             if (preference != null) {
                 String summary;
+                int titleColor;
                 if (Build.VERSION.SDK_INT < 28)
                     summary = context.getString(R.string.phone_profiles_pref_eventMobileCellsLocationSystemSettingsNotA9_summary);
                 else
                     summary = context.getString(R.string.phone_profiles_pref_eventMobileCellsLocationSystemSettings_summary);
                 if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
-                    if (Build.VERSION.SDK_INT < 28)
+                    if (Build.VERSION.SDK_INT < 28) {
                         summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT + summary;
-                    else
-                        summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *"+StringConstants.STR_DOUBLE_NEWLINE + summary;
+                        titleColor = 0;
+                    }
+                    else {
+                        summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *" + StringConstants.STR_DOUBLE_NEWLINE + summary;
+                        titleColor = ContextCompat.getColor(context, R.color.error_color);
+                    }
                 }
                 else {
                     summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsEnabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT+
                             summary;
+                    titleColor = 0;
+                }
+                CharSequence sTitle = preference.getTitle();
+                int titleLenght = 0;
+                if (sTitle != null)
+                    titleLenght = sTitle.length();
+                Spannable sbt = new SpannableString(sTitle);
+                Object[] spansToRemove = sbt.getSpans(0, titleLenght, Object.class);
+                for(Object span: spansToRemove){
+                    if(span instanceof CharacterStyle)
+                        sbt.removeSpan(span);
                 }
+                if (preferences.getBoolean(PREF_EVENT_MOBILE_CELLS_ENABLED, false)) {
+                    if (titleColor != 0)
+                        sbt.setSpan(new ForegroundColorSpan(titleColor), 0, sbt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+                preference.setTitle(sbt);
                 preference.setSummary(summary);
             }
         }
@@ -301,6 +330,7 @@ else if (!hasSIMCard) {
         event.createEventPreferences();
         event._eventPreferencesMobileCells.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesMobileCells.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesMobileCells.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_MOBILE_CELLS_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_MOBILE_CELLS_CELL_NAMES);
         if (preference != null) {
@@ -356,7 +386,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_MOBILE_CELLS).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -384,6 +414,23 @@ boolean isRunnable(Context context)
         return runnable;
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        allConfigured = allConfigured &&
+                (ApplicationPreferences.applicationEventMobileCellEnableScanning ||
+                 ApplicationPreferences.applicationEventMobileCellDisabledScannigByProfile);
+
+        if (Build.VERSION.SDK_INT >= 28) {
+            allConfigured = allConfigured && GlobalUtils.isLocationEnabled(context.getApplicationContext());
+        }
+
+        return allConfigured;
+    }
+
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
@@ -490,84 +537,128 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                     eventsHandler.mobileCellPassed = false;
                 } else {
 //                    PPApplicationStatic.logE("[TEST BATTERY] EventPreferencesMobileCells.doHandleEvent", "******** ### *******");
-                    //PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                    if (!PPApplication.isScreenOn && ApplicationPreferences.applicationEventMobileCellScanOnlyWhenScreenIsOn) {
-                        if (forRestartEvents)
-                            eventsHandler.mobileCellPassed = (EventPreferences.SENSOR_PASSED_PASSED & getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
-                        else
-                            // not allowed for screen Off
-                            eventsHandler.notAllowedMobileCell = true;
-                    } else {
-                        boolean scanningPaused = ApplicationPreferences.applicationEventMobileCellScanInTimeMultiply.equals("2") &&
-                                GlobalUtils.isNowTimeBetweenTimes(
-                                        ApplicationPreferences.applicationEventMobileCellScanInTimeMultiplyFrom,
-                                        ApplicationPreferences.applicationEventMobileCellScanInTimeMultiplyTo);
+                    if ((Build.VERSION.SDK_INT < 28) || GlobalUtils.isLocationEnabled(eventsHandler.context)) {
+
+                        //PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+                        if (!PPApplication.isScreenOn && ApplicationPreferences.applicationEventMobileCellScanOnlyWhenScreenIsOn) {
+                            if (forRestartEvents)
+                                eventsHandler.mobileCellPassed = (EventPreferences.SENSOR_PASSED_PASSED & getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
+                            else
+                                // not allowed for screen Off
+                                eventsHandler.notAllowedMobileCell = true;
+                        } else {
+                            boolean scanningPaused = ApplicationPreferences.applicationEventMobileCellScanInTimeMultiply.equals("2") &&
+                                    GlobalUtils.isNowTimeBetweenTimes(
+                                            ApplicationPreferences.applicationEventMobileCellScanInTimeMultiplyFrom,
+                                            ApplicationPreferences.applicationEventMobileCellScanInTimeMultiplyTo);
 
-                        if (!scanningPaused) {
+                            if (!scanningPaused) {
 
 //                            PPApplicationStatic.logE("[SYNCHRONIZED] EventPreferencesMobileCells.doHandleEvent", "PPApplication.mobileCellsScannerMutex");
-                            synchronized (PPApplication.mobileCellsScannerMutex) {
-                                if ((PhoneProfilesService.getInstance() != null) && (PPApplication.mobileCellsScanner != null)) {
+                                synchronized (PPApplication.mobileCellsScannerMutex) {
+                                    if ((PhoneProfilesService.getInstance() != null) && (PPApplication.mobileCellsScanner != null)) {
 
-                                    try {
-                                        int simCount = 0;
+                                        try {
+                                            int simCount = 0;
 
-                                        TelephonyManager telephonyManager = (TelephonyManager) eventsHandler.context.getSystemService(Context.TELEPHONY_SERVICE);
-                                        if (telephonyManager != null) {
-                                            simCount = telephonyManager.getPhoneCount();
-                                        }
-
-                                        DatabaseHandler db = DatabaseHandler.getInstance(eventsHandler.context);
+                                            TelephonyManager telephonyManager = (TelephonyManager) eventsHandler.context.getSystemService(Context.TELEPHONY_SERVICE);
+                                            if (telephonyManager != null) {
+                                                simCount = telephonyManager.getPhoneCount();
+                                            }
 
-                                        boolean cellIsValid = false;
-                                        if ((simCount > 1)) {
-                                            if ((_forSIMCard == 0) || (_forSIMCard == 1)) {
-                                                if (PPApplication.mobileCellsScanner != null) {
-                                                    int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(1);
-                                                    if (MobileCellsScanner.isValidCellId(registeredCell)) {
-                                                        //String sRegisteredCell = Integer.toString(registeredCell);
-                                                        List<MobileCellsData> _cellsList = new ArrayList<>();
-                                                        db.addMobileCellsToList(_cellsList, registeredCell);
-                                                        if (!_cellsList.isEmpty()) {
-                                                           // registered cell is configured
-                                                            String[] splits = _cellsNames.split(StringConstants.STR_SPLIT_REGEX);
-                                                            if (_whenOutside) {
-                                                                // all mobile cells must not be registered
-                                                                eventsHandler.mobileCellPassed = true;
-                                                                for (String cellName : splits) {
-                                                                    if (cellName.equals(_cellsList.get(0).name)) {
-                                                                        // one of cell names in configuration is registered
-                                                                        eventsHandler.mobileCellPassed = false;
-                                                                        break;
+                                            DatabaseHandler db = DatabaseHandler.getInstance(eventsHandler.context);
+
+                                            boolean cellIsValid = false;
+                                            if ((simCount > 1)) {
+                                                if ((_forSIMCard == 0) || (_forSIMCard == 1)) {
+                                                    if (PPApplication.mobileCellsScanner != null) {
+                                                        int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(1);
+                                                        long registeredCellLong = PPApplication.mobileCellsScanner.getRegisteredCellLong(1);
+                                                        if (MobileCellsScanner.isValidCellId(registeredCell, registeredCellLong)) {
+                                                            //String sRegisteredCell = Integer.toString(registeredCell);
+                                                            List<MobileCellsData> _cellsList = new ArrayList<>();
+                                                            db.addMobileCellsToList(_cellsList, registeredCell, registeredCellLong);
+                                                            if (!_cellsList.isEmpty()) {
+                                                                // registered cell is configured
+                                                                String[] splits = _cellsNames.split(StringConstants.STR_SPLIT_REGEX);
+                                                                if (_whenOutside) {
+                                                                    // all mobile cells must not be registered
+                                                                    eventsHandler.mobileCellPassed = true;
+                                                                    for (String cellName : splits) {
+                                                                        if (cellName.equals(_cellsList.get(0).name)) {
+                                                                            // one of cell names in configuration is registered
+                                                                            eventsHandler.mobileCellPassed = false;
+                                                                            break;
+                                                                        }
+                                                                    }
+                                                                } else {
+                                                                    // one mobile cell must be registered
+                                                                    eventsHandler.mobileCellPassed = false;
+                                                                    for (String cellName : splits) {
+                                                                        if (cellName.equals(_cellsList.get(0).name)) {
+                                                                            // one of cell names in configuration is registered
+                                                                            eventsHandler.mobileCellPassed = true;
+                                                                            break;
+                                                                        }
                                                                     }
                                                                 }
                                                             } else {
-                                                                // one mobile cell must be registered
-                                                                eventsHandler.mobileCellPassed = false;
-                                                                for (String cellName : splits) {
-                                                                    if (cellName.equals(_cellsList.get(0).name)) {
-                                                                        // one of cell names in configuration is registered
-                                                                        eventsHandler.mobileCellPassed = true;
-                                                                        break;
+                                                                //eventsHandler.mobileCellPassed = false;
+                                                                eventsHandler.mobileCellPassed = _whenOutside;
+                                                            }
+                                                            cellIsValid = true;
+                                                        }
+                                                    }
+                                                }
+
+                                                if (((_forSIMCard == 0) && ((!cellIsValid) || (!eventsHandler.mobileCellPassed))) ||
+                                                        (_forSIMCard == 2)) {
+                                                    if (PPApplication.mobileCellsScanner != null) {
+                                                        int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(2);
+                                                        long registeredCellLong = PPApplication.mobileCellsScanner.getRegisteredCellLong(2);
+                                                        if (MobileCellsScanner.isValidCellId(registeredCell, registeredCellLong)) {
+                                                            //String sRegisteredCell = Integer.toString(registeredCell);
+                                                            List<MobileCellsData> _cellsList = new ArrayList<>();
+                                                            db.addMobileCellsToList(_cellsList, registeredCell, registeredCellLong);
+                                                            if (!_cellsList.isEmpty()) {
+                                                                String[] splits = _cellsNames.split(StringConstants.STR_SPLIT_REGEX);
+                                                                if (_whenOutside) {
+                                                                    // all mobile cells must not be registered
+                                                                    eventsHandler.mobileCellPassed = true;
+                                                                    for (String cellName : splits) {
+                                                                        if (cellName.equals(_cellsList.get(0).name)) {
+                                                                            // one of cells in configuration is registered
+                                                                            eventsHandler.mobileCellPassed = false;
+                                                                            break;
+                                                                        }
+                                                                    }
+                                                                } else {
+                                                                    // one mobile cell must be registered
+                                                                    eventsHandler.mobileCellPassed = false;
+                                                                    for (String cellName : splits) {
+                                                                        if (cellName.equals(_cellsList.get(0).name)) {
+                                                                            // one of cells in configuration is registered
+                                                                            eventsHandler.mobileCellPassed = true;
+                                                                            break;
+                                                                        }
                                                                     }
                                                                 }
+                                                            } else {
+                                                                //eventsHandler.mobileCellPassed = false;
+                                                                eventsHandler.mobileCellPassed = _whenOutside;
                                                             }
-                                                        } else {
-                                                            eventsHandler.mobileCellPassed = false;
+                                                            cellIsValid = true;
                                                         }
-                                                        cellIsValid = true;
                                                     }
                                                 }
-                                            }
-
-                                            if (((_forSIMCard == 0) && ((!cellIsValid) || (!eventsHandler.mobileCellPassed))) ||
-                                                    (_forSIMCard == 2)) {
+                                            } else {
                                                 if (PPApplication.mobileCellsScanner != null) {
-                                                    int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(2);
-                                                    if (MobileCellsScanner.isValidCellId(registeredCell)) {
+                                                    int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(0);
+                                                    long registeredCellLong = PPApplication.mobileCellsScanner.getRegisteredCellLong(0);
+                                                    if (MobileCellsScanner.isValidCellId(registeredCell, registeredCellLong)) {
                                                         //String sRegisteredCell = Integer.toString(registeredCell);
                                                         List<MobileCellsData> _cellsList = new ArrayList<>();
-                                                        db.addMobileCellsToList(_cellsList, registeredCell);
+                                                        db.addMobileCellsToList(_cellsList, registeredCell, registeredCellLong);
                                                         if (!_cellsList.isEmpty()) {
                                                             String[] splits = _cellsNames.split(StringConstants.STR_SPLIT_REGEX);
                                                             if (_whenOutside) {
@@ -592,65 +683,31 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                                                                 }
                                                             }
                                                         } else {
-                                                            eventsHandler.mobileCellPassed = false;
+                                                            //eventsHandler.mobileCellPassed = false;
+                                                            eventsHandler.mobileCellPassed = _whenOutside;
                                                         }
                                                         cellIsValid = true;
                                                     }
                                                 }
                                             }
-                                        } else {
-                                            if (PPApplication.mobileCellsScanner != null) {
-                                                int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(0);
-                                                if (MobileCellsScanner.isValidCellId(registeredCell)) {
-                                                    //String sRegisteredCell = Integer.toString(registeredCell);
-                                                    List<MobileCellsData> _cellsList = new ArrayList<>();
-                                                    db.addMobileCellsToList(_cellsList, registeredCell);
-                                                    if (!_cellsList.isEmpty()) {
-                                                        String[] splits = _cellsNames.split(StringConstants.STR_SPLIT_REGEX);
-                                                        if (_whenOutside) {
-                                                            // all mobile cells must not be registered
-                                                            eventsHandler.mobileCellPassed = true;
-                                                            for (String cellName : splits) {
-                                                                if (cellName.equals(_cellsList.get(0).name)) {
-                                                                    // one of cells in configuration is registered
-                                                                    eventsHandler.mobileCellPassed = false;
-                                                                    break;
-                                                                }
-                                                            }
-                                                        } else {
-                                                            // one mobile cell must be registered
-                                                            eventsHandler.mobileCellPassed = false;
-                                                            for (String cellName : splits) {
-                                                                if (cellName.equals(_cellsList.get(0).name)) {
-                                                                    // one of cells in configuration is registered
-                                                                    eventsHandler.mobileCellPassed = true;
-                                                                    break;
-                                                                }
-                                                            }
-                                                        }
-                                                    } else {
-                                                        eventsHandler.mobileCellPassed = false;
-                                                    }
-                                                    cellIsValid = true;
-                                                }
-                                            }
-                                        }
 
-                                        if (!cellIsValid)
+                                            if (!cellIsValid)
+                                                eventsHandler.notAllowedMobileCell = true;
+
+                                        } catch (Exception e) {
                                             eventsHandler.notAllowedMobileCell = true;
 
-                                    } catch (Exception e) {
+                                            if (PPApplication.mobileCellsScanner != null)
+                                                PPApplicationStatic.recordException(e);
+                                        }
+                                    } else
                                         eventsHandler.notAllowedMobileCell = true;
-
-                                        if (PPApplication.mobileCellsScanner != null)
-                                            PPApplicationStatic.recordException(e);
-                                    }
-                                } else
-                                    eventsHandler.notAllowedMobileCell = true;
-                            }
-                        } else
-                            eventsHandler.mobileCellPassed = false;
-                    }
+                                }
+                            } else
+                                eventsHandler.mobileCellPassed = false;
+                        }
+                    }  else
+                        eventsHandler.mobileCellPassed = false;
                 }
 
                 if (!eventsHandler.notAllowedMobileCell) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMusic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMusic.java
index c1776c06d4..7aa7ac08ed 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMusic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesMusic.java
@@ -1,14 +1,19 @@
 package sk.henrichg.phoneprofilesplus;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.media.AudioManager;
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.SwitchPreferenceCompat;
 
+import java.util.List;
+
 class EventPreferencesMusic extends EventPreferences {
 
     int _musicState;
@@ -148,7 +153,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_MUSIC).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -205,14 +210,49 @@ void doHandleEvent(EventsHandler eventsHandler/*, boolean forRestartEvents*/) {
         if (_enabled) {
             int oldSensorPassed = getSensorPassed();
             if (EventStatic.isEventPreferenceAllowed(EventPreferencesMusic.PREF_EVENT_MUSIC_ENABLED, eventsHandler.context).allowed == PreferenceAllowed.PREFERENCE_ALLOWED) {
-                AudioManager audioManager = (AudioManager)eventsHandler.context.getSystemService(Context.AUDIO_SERVICE);
-                if (audioManager != null) {
-                    if (_musicState == 1)
-                        eventsHandler.musicPassed = !audioManager.isMusicActive();
-                    else
-                        eventsHandler.musicPassed = audioManager.isMusicActive();
-                }
-                else
+                boolean isNotAllowedSession = false;
+
+                // play media from PPP is ignored
+                if ((RingtonePreference.mediaPlayer == null) &&
+                        (VolumeDialogPreferenceFragment.mediaPlayer == null) /*&&
+                        not needed to test it, it uses ALARM channel
+                        (PlayRingingNotification.ringingMediaPlayer == null)*/) {
+                    AudioManager audioManager = (AudioManager) eventsHandler.context.getSystemService(Context.AUDIO_SERVICE);
+                    if (audioManager != null) {
+                        if (PPNotificationListenerService.isNotificationListenerServiceEnabled(eventsHandler.context, true)) {
+                            // notification acces isgranted, get controloer package name
+
+                            MediaSessionManager mediaSessionManager = (MediaSessionManager) eventsHandler.context.getSystemService(Context.MEDIA_SESSION_SERVICE);
+                            if (mediaSessionManager != null) {
+                                List<MediaController> activeSessions;
+                                ComponentName notificationListenerComponent = new ComponentName(eventsHandler.context, PPNotificationListenerService.class);
+                                activeSessions = mediaSessionManager.getActiveSessions(notificationListenerComponent);
+
+                                //Log.e("EventPreferencesMusic.doHandleEvent", "activeSessions=" + activeSessions.size());
+                                for (MediaController controller : activeSessions) {
+                                    //Log.e("EventPreferencesMusic.doHandleEvent", "controller=" + controller.getPackageName());
+                                    if (controller.getPackageName().equals(PPApplication.PACKAGE_NAME)) {
+                                        isNotAllowedSession = true;
+                                        break;
+                                    }
+                                }
+                            } else
+                                eventsHandler.notAllowedMusic = true;
+                        }
+
+                        if (!isNotAllowedSession) {
+                            // allowed session for detection
+                            if (_musicState == 1)
+                                eventsHandler.musicPassed = !audioManager.isMusicActive();
+                            else
+                                eventsHandler.musicPassed = audioManager.isMusicActive();
+                            //Log.e("EventPreferencesMusic.doHandleEvent", "musicPassed=" + eventsHandler.musicPassed);
+                        } else
+                            eventsHandler.notAllowedMusic = true;
+
+                    } else
+                        eventsHandler.notAllowedMusic = true;
+                } else
                     eventsHandler.notAllowedMusic = true;
 
                 if (!eventsHandler.notAllowedMusic) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNFC.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNFC.java
index 5ace980524..cb8bbd497d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNFC.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNFC.java
@@ -158,6 +158,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesNFC.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesNFC.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesNFC.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_NFC_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_NFC_NFC_TAGS);
         if (preference != null) {
@@ -219,7 +220,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_NFC_TAG).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -313,7 +314,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNotification.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNotification.java
index a727967499..8782c494a8 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNotification.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesNotification.java
@@ -375,6 +375,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesNotification.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesNotification.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesNotification.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_NOTIFICATION_ENABLED, false);
         SwitchPreferenceCompat switchPreference = prefMng.findPreference(PREF_EVENT_NOTIFICATION_IN_CALL);
         if (switchPreference != null) {
@@ -488,7 +489,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_NOTIFICATION).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -530,6 +531,19 @@ boolean isRunnable(Context context)
         return runnable;
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        allConfigured = allConfigured &&
+                (ApplicationPreferences.applicationEventNotificationEnableScanning ||
+                        ApplicationPreferences.applicationEventNotificationDisabledScannigByProfile);
+
+        return allConfigured;
+    }
+
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
@@ -628,7 +642,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(context), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesOrientation.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesOrientation.java
index 3f92e61299..01551c52a1 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesOrientation.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesOrientation.java
@@ -446,6 +446,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesOrientation.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesOrientation.isRunnable(context.getApplicationContext());
+        //boolean isAllConfigured = event._eventPreferencesOrientation.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_ORIENTATION_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_ORIENTATION_DISPLAY);
         if (preference != null) {
@@ -644,7 +645,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
             Preference preference = prefMng.findPreference(PREF_EVENT_ORIENTATION_CATEGORY);
             if (preference != null) {
                 boolean enabled = tmp._enabled; //(preferences != null) && preferences.getBoolean(PREF_EVENT_ORIENTATION_ENABLED, false);
-                boolean runnable = tmp.isRunnable(context) &&
+                boolean runnable = tmp.isRunnable(context) && tmp.isAllConfigured(context) &&
                         (tmp.isAccessibilityServiceEnabled(context, false) == 1) &&
                         (PPApplication.accessibilityServiceForPPPExtenderConnected == 1);
                 boolean permissionGranted = true;
@@ -695,6 +696,18 @@ boolean isRunnable(Context context)
         return runnable;
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        allConfigured = allConfigured &&
+                (ApplicationPreferences.applicationEventOrientationEnableScanning ||
+                        ApplicationPreferences.applicationEventOrientationDisabledScannigByProfile);
+
+        return allConfigured;
+    }
+
     @Override
     int isAccessibilityServiceEnabled(Context context, boolean againCheckInDelay)
     {
@@ -703,7 +716,8 @@ int isAccessibilityServiceEnabled(Context context, boolean againCheckInDelay)
             return -2;
         if (extenderVersion < PPApplication.VERSION_CODE_EXTENDER_8_1_3)
             return -1;
-        if ((_event.getStatus() != Event.ESTATUS_STOP) && (_event.getStatus() != Event.ESTATUS_STOP) && this._enabled && isRunnable(context)) {
+        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled &&
+                isRunnable(context) && isAllConfigured(context)) {
             if (PPExtenderBroadcastReceiver.isAccessibilityServiceEnabled(context, againCheckInDelay, true
                         /*, "EventPreferencesOrientation.isAccessibilityServiceEnabled"*/))
                 return 1;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesPeriodic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesPeriodic.java
index a2d634629c..1394d8136a 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesPeriodic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesPeriodic.java
@@ -273,7 +273,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_PERIODIC).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -296,6 +296,18 @@ boolean isRunnable(Context context)
         return super.isRunnable(context);
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        allConfigured = allConfigured &&
+                (ApplicationPreferences.applicationEventPeriodicScanningEnableScanning ||
+                        ApplicationPreferences.applicationEventPeriodicScanningDisabledScannigByProfile);
+
+        return allConfigured;
+    }
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
@@ -346,7 +358,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRadioSwitch.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRadioSwitch.java
index 41e6704b99..1135e98de4 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRadioSwitch.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRadioSwitch.java
@@ -453,6 +453,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesRadioSwitch.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesRadioSwitch.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesRadioSwitch.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_RADIO_SWITCH_ENABLED, false);
         PPListPreference preference = prefMng.findPreference(PREF_EVENT_RADIO_SWITCH_WIFI);
         if (preference != null) {
@@ -619,7 +620,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_RADIO_SWITCH).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRoaming.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRoaming.java
index 73e03e821c..e03c420cac 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRoaming.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesRoaming.java
@@ -207,6 +207,7 @@ else if (!hasSIMCard) {
         event.createEventPreferences();
         event._eventPreferencesRoaming.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesRoaming.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesRoaming.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_ROAMING_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_ROAMING_CHECK_NETWORK);
         if (preference != null) {
@@ -259,7 +260,8 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
             Preference preference = prefMng.findPreference(PREF_EVENT_ROAMING_CATEGORY);
             if (preference != null) {
                 boolean enabled = tmp._enabled; //(preferences != null) && preferences.getBoolean(PREF_EVENT_ROAMING_ENABLED, false);
-                boolean runnable = tmp.isRunnable(context) && (tmp.isAccessibilityServiceEnabled(context, false) == 1);
+                boolean runnable = tmp.isRunnable(context) && tmp.isAllConfigured(context) &&
+                        (tmp.isAccessibilityServiceEnabled(context, false) == 1);
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_ROAMING).isEmpty();
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSMS.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSMS.java
index 8e906680e2..ee869a603f 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSMS.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSMS.java
@@ -322,6 +322,7 @@ else if (!hasSIMCard) {
         event.createEventPreferences();
         event._eventPreferencesSMS.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesSMS.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesSMS.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_SMS_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_SMS_CONTACT_GROUPS);
         if (preference != null) {
@@ -423,7 +424,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
             Preference preference = prefMng.findPreference(PREF_EVENT_SMS_CATEGORY);
             if (preference != null) {
                 boolean enabled = tmp._enabled; //(preferences != null) && preferences.getBoolean(PREF_EVENT_SMS_ENABLED, false);
-                boolean runnable = tmp.isRunnable(context) &&
+                boolean runnable = tmp.isRunnable(context) && tmp.isAllConfigured(context) &&
                         (tmp.isAccessibilityServiceEnabled(context, false) == 1) &&
                         (PPApplication.accessibilityServiceForPPPExtenderConnected == 1);
                 boolean permissionGranted = true;
@@ -466,7 +467,8 @@ int isAccessibilityServiceEnabled(Context context, boolean againCheckInDelay)
             return -2;
         if (extenderVersion < PPApplication.VERSION_CODE_EXTENDER_8_1_3)
             return -1;
-        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled && isRunnable(context)) {
+        if ((_event.getStatus() != Event.ESTATUS_STOP) && this._enabled &&
+                isRunnable(context) && isAllConfigured(context)) {
             if (PPExtenderBroadcastReceiver.isAccessibilityServiceEnabled(context, againCheckInDelay, true
                         /*, "EventPreferencesSMS.isAccessibilityServiceEnabled"*/))
                 return 1;
@@ -574,7 +576,7 @@ void setSystemEventForPause(Context context)
 
         removeAlarm(context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         setAlarm(computeAlarm(), context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesScreen.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesScreen.java
index faad3596d0..66cc570ff8 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesScreen.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesScreen.java
@@ -167,7 +167,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_SCREEN).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSoundProfile.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSoundProfile.java
index 00d0d31260..b6d4b761a1 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSoundProfile.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesSoundProfile.java
@@ -176,6 +176,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesSoundProfile.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesSoundProfile.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesSoundProfile.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_SOUND_PROFILE_ENABLED, false);
 
         Preference preference = prefMng.findPreference(PREF_EVENT_SOUND_PROFILE_RINGER_MODES);
@@ -302,7 +303,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_SOUND_PROFILE).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesTime.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesTime.java
index fe7e391c16..35dc652d64 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesTime.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesTime.java
@@ -10,7 +10,9 @@
 import android.text.SpannableString;
 import android.text.format.DateFormat;
 import android.text.style.CharacterStyle;
+import android.text.style.ForegroundColorSpan;
 
+import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.SwitchPreferenceCompat;
@@ -429,18 +431,43 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
             if (preference != null)
                 preference.setEnabled(!enable);
         }
-        if (key.equals(PREF_EVENT_TIME_LOCATION_SYSTEM_SETTINGS)) {
+        if (key.equals(PREF_EVENT_TIME_ENABLED) ||
+            key.equals(PREF_EVENT_TIME_LOCATION_SYSTEM_SETTINGS)) {
             Preference preference = prefMng.findPreference(key);
             if (preference != null) {
                 String summary = context.getString(R.string.event_preference_sensor_time_locationSystemSettings_summary);
+                int titleColor;
                 if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
-                    summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *"+StringConstants.STR_DOUBLE_NEWLINE+
-                            summary;
+                    if (_timeType != TIME_TYPE_EXACT) {
+                        summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *"+StringConstants.STR_DOUBLE_NEWLINE+
+                                summary;
+                        titleColor = ContextCompat.getColor(context, R.color.error_color);
+                    } else {
+                        summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + StringConstants.STR_DOUBLE_NEWLINE+
+                                summary;
+                        titleColor = 0;
+                    }
                 }
                 else {
                     summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsEnabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT+
                             summary;
+                    titleColor = 0;
                 }
+                CharSequence sTitle = preference.getTitle();
+                int titleLenght = 0;
+                if (sTitle != null)
+                    titleLenght = sTitle.length();
+                Spannable sbt = new SpannableString(sTitle);
+                Object[] spansToRemove = sbt.getSpans(0, titleLenght, Object.class);
+                for(Object span: spansToRemove){
+                    if(span instanceof CharacterStyle)
+                        sbt.removeSpan(span);
+                }
+                if (preferences.getBoolean(PREF_EVENT_TIME_ENABLED, false)) {
+                    if (titleColor != 0)
+                        sbt.setSpan(new ForegroundColorSpan(titleColor), 0, sbt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+                preference.setTitle(sbt);
                 preference.setSummary(summary);
             }
         }
@@ -449,6 +476,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesTime.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesTime.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesTime.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_TIME_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_TIME_DAYS);
         if (preference != null) {
@@ -507,7 +535,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_TIME).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -542,6 +570,23 @@ boolean isRunnable(Context context)
         return runnable;
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        //allConfigured = allConfigured &&
+        //        (ApplicationPreferences.applicationEventLocationEnableScanning ||
+        //                ApplicationPreferences.applicationEventLocationDisabledScannigByProfile);
+
+        if (_timeType != TIME_TYPE_EXACT) {
+            allConfigured = allConfigured && GlobalUtils.isLocationEnabled(context.getApplicationContext());
+        }
+
+        return allConfigured;
+    }
+
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
@@ -982,7 +1027,7 @@ void setSystemEventForStart(Context context)
         //removeAlarm(true, _context);
         removeAlarm(/*false, */context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         long alarmTime = computeAlarm(true/*, context*/);
@@ -1005,7 +1050,7 @@ void setSystemEventForPause(Context context)
         //removeAlarm(true, _context);
         removeAlarm(/*false, */context);
 
-        if (!(isRunnable(context) && _enabled))
+        if (!(isRunnable(context) && isAllConfigured(context) && _enabled))
             return;
 
         long alarmTime = computeAlarm(false/*, context*/);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVPN.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVPN.java
index b761bc84f0..f64c6f177a 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVPN.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVPN.java
@@ -97,6 +97,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesVPN.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesVPN.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesVPN.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_VPN_ENABLED, false);
         PPListPreference preference = prefMng.findPreference(PREF_EVENT_VPN_CONNECTION_STATUS);
         if (preference != null) {
@@ -140,7 +141,8 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
             Preference preference = prefMng.findPreference(PREF_EVENT_VPN_CATEGORY);
             if (preference != null) {
                 boolean enabled = tmp._enabled; //(preferences != null) && preferences.getBoolean(PREF_EVENT_ROAMING_ENABLED, false);
-                boolean runnable = tmp.isRunnable(context) && (tmp.isAccessibilityServiceEnabled(context, false) == 1);
+                boolean runnable = tmp.isRunnable(context) && tmp.isAllConfigured(context) &&
+                        (tmp.isAccessibilityServiceEnabled(context, false) == 1);
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_VPN).isEmpty();
@@ -203,21 +205,18 @@ void doHandleEvent(EventsHandler eventsHandler/*, boolean forRestartEvents*/) {
         if (_enabled) {
             int oldSensorPassed = getSensorPassed();
             if (EventStatic.isEventPreferenceAllowed(EventPreferencesVPN.PREF_EVENT_VPN_ENABLED, eventsHandler.context).allowed == PreferenceAllowed.PREFERENCE_ALLOWED) {
+                if (_connectionStatus == 0)
+                    eventsHandler.vpnPassed = PPApplication.vpnNetworkConnected;
+                else
+                if (_connectionStatus == 1)
+                    eventsHandler.vpnPassed = !PPApplication.vpnNetworkConnected;
+                else
+                    eventsHandler.vpnPassed = false;
 
-                if (!eventsHandler.notAllowedVPN) {
-                    if (_connectionStatus == 0)
-                        eventsHandler.vpnPassed = PPApplication.vpnNetworkConnected;
-                    else
-                    if (_connectionStatus == 1)
-                        eventsHandler.vpnPassed = !PPApplication.vpnNetworkConnected;
-                    else
-                        eventsHandler.vpnPassed = false;
-
-                    if (eventsHandler.vpnPassed)
-                        setSensorPassed(EventPreferences.SENSOR_PASSED_PASSED);
-                    else
-                        setSensorPassed(EventPreferences.SENSOR_PASSED_NOT_PASSED);
-                }
+                if (eventsHandler.vpnPassed)
+                    setSensorPassed(EventPreferences.SENSOR_PASSED_PASSED);
+                else
+                    setSensorPassed(EventPreferences.SENSOR_PASSED_NOT_PASSED);
             }
             else
                 eventsHandler.notAllowedVPN = true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVolumes.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVolumes.java
index 3e3ea31254..7db2176ed6 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVolumes.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesVolumes.java
@@ -405,6 +405,7 @@ private void setSummary(PreferenceManager prefMng, String key,
         event.createEventPreferences();
         event._eventPreferencesVolumes.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesVolumes.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesVolumes.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_VOLUMES_ENABLED, false);
         VolumeDialogPreference preference = prefMng.findPreference(PREF_EVENT_VOLUMES_RINGTONE_FROM);
         String defaultValue = "0|0|0";
@@ -564,7 +565,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_VOLUMES).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesWifi.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesWifi.java
index 3c83791bb7..6722b13608 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesWifi.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventPreferencesWifi.java
@@ -94,6 +94,7 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                     _value.append(StringConstants.TAG_BOLD_END_WITH_SPACE_HTML);
                 }
 
+                boolean locationErrorDisplayed = false;
                 if ((this._connectionType == 1) || (this._connectionType == 3)) {
                     if (!ApplicationPreferences.applicationEventWifiEnableScanning) {
                         if (!ApplicationPreferences.applicationEventWifiDisabledScannigByProfile)
@@ -102,6 +103,7 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                             _value.append(context.getString(R.string.phone_profiles_pref_applicationEventScanningDisabledByProfile)).append(StringConstants.TAG_BREAK_HTML);
                     } else if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
                         _value.append("* ").append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append("! *").append(StringConstants.TAG_BREAK_HTML);
+                        locationErrorDisplayed = true;
                     } else {
                         boolean scanningPaused = ApplicationPreferences.applicationEventWifiScanInTimeMultiply.equals("2") &&
                                 GlobalUtils.isNowTimeBetweenTimes(
@@ -112,6 +114,11 @@ String getPreferencesDescription(boolean addBullet, boolean addPassStatus, boole
                         }
                     }
                 }
+                if (Build.VERSION.SDK_INT >= 29) {
+                    if ((!locationErrorDisplayed) && (!GlobalUtils.isLocationEnabled(context.getApplicationContext()))) {
+                        _value.append("* ").append(context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary)).append("! *").append(StringConstants.TAG_BREAK_HTML);
+                    }
+                }
 
                 String[] connectionListTypes = context.getResources().getStringArray(R.array.eventWifiConnectionTypeValues);
                 int index = Arrays.asList(connectionListTypes).indexOf(Integer.toString(this._connectionType));
@@ -230,18 +237,41 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
                 preference.setSummary(summary);
             }
         }
-        if (key.equals(PREF_EVENT_WIFI_LOCATION_SYSTEM_SETTINGS)) {
-            Preference preference = prefMng.findPreference(key);
+        if (key.equals(PREF_EVENT_WIFI_ENABLED) ||
+            key.equals(PREF_EVENT_WIFI_LOCATION_SYSTEM_SETTINGS)) {
+            Preference preference = prefMng.findPreference(PREF_EVENT_WIFI_LOCATION_SYSTEM_SETTINGS);
             if (preference != null) {
-                String summary = context.getString(R.string.phone_profiles_pref_eventWiFiLocationSystemSettings_summary);
+                String summary;
+                int titleColor;
+                if (Build.VERSION.SDK_INT < 29)
+                    summary = context.getString(R.string.phone_profiles_pref_eventWiFiLocationSystemSettings_summary);
+                else
+                    summary = context.getString(R.string.phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29);
                 if (!GlobalUtils.isLocationEnabled(context.getApplicationContext())) {
                     summary = "* " + context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + "! *"+StringConstants.STR_DOUBLE_NEWLINE+
                             summary;
+                    titleColor = ContextCompat.getColor(context, R.color.error_color);
                 }
                 else {
                     summary = context.getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsEnabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT+
                             summary;
+                    titleColor = 0;
                 }
+                CharSequence sTitle = preference.getTitle();
+                int titleLenght = 0;
+                if (sTitle != null)
+                    titleLenght = sTitle.length();
+                Spannable sbt = new SpannableString(sTitle);
+                Object[] spansToRemove = sbt.getSpans(0, titleLenght, Object.class);
+                for(Object span: spansToRemove){
+                    if(span instanceof CharacterStyle)
+                        sbt.removeSpan(span);
+                }
+                if (preferences.getBoolean(PREF_EVENT_WIFI_ENABLED, false)) {
+                    if (titleColor != 0)
+                        sbt.setSpan(new ForegroundColorSpan(titleColor), 0, sbt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+                preference.setTitle(sbt);
                 preference.setSummary(summary);
             }
         }
@@ -275,6 +305,7 @@ private void setSummary(PreferenceManager prefMng, String key, String value, Con
         event.createEventPreferences();
         event._eventPreferencesWifi.saveSharedPreferences(prefMng.getSharedPreferences());
         boolean isRunnable = event._eventPreferencesWifi.isRunnable(context);
+        //boolean isAllConfigured = event._eventPreferencesWifi.isAllConfigured(context);
         boolean enabled = preferences.getBoolean(PREF_EVENT_WIFI_ENABLED, false);
         Preference preference = prefMng.findPreference(PREF_EVENT_WIFI_SSID);
         if (preference != null) {
@@ -342,7 +373,7 @@ void setCategorySummary(PreferenceManager prefMng, /*String key,*/ SharedPrefere
                 boolean permissionGranted = true;
                 if (enabled)
                     permissionGranted = Permissions.checkEventPermissions(context, null, preferences, EventsHandler.SENSOR_TYPE_WIFI_SCANNER).isEmpty();
-                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && permissionGranted), false);
+                GlobalGUIRoutines.setPreferenceTitleStyleX(preference, enabled, tmp._enabled, false, false, !(tmp.isRunnable(context) && tmp.isAllConfigured(context) && permissionGranted), false);
                 if (enabled)
                     preference.setSummary(StringFormatUtils.fromHtml(tmp.getPreferencesDescription(false, false, !preference.isEnabled(), context), false,  false, 0, 0, true));
                 else
@@ -365,6 +396,23 @@ boolean isRunnable(Context context)
         return super.isRunnable(context) && (!this._SSID.isEmpty());
     }
 
+    @Override
+    boolean isAllConfigured(Context context)
+    {
+        boolean allConfigured = super.isAllConfigured(context);
+
+        if ((this._connectionType == 1) || (this._connectionType == 3)) {
+            allConfigured = allConfigured &&
+                    (ApplicationPreferences.applicationEventWifiEnableScanning ||
+                     ApplicationPreferences.applicationEventWifiDisabledScannigByProfile);
+        }
+
+        if (Build.VERSION.SDK_INT >= 29)
+            allConfigured = allConfigured && GlobalUtils.isLocationEnabled(context.getApplicationContext());
+
+        return allConfigured;
+    }
+
     @Override
     void checkPreferences(PreferenceManager prefMng, boolean onlyCategory, Context context) {
         super.checkPreferences(prefMng, onlyCategory, context);
@@ -405,40 +453,42 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                 // permissions are checked in EditorActivity.displayRedTextToPreferencesNotification()
                 /*&& Permissions.checkEventLocation(context, event, null)*/) {
 
-                eventsHandler.wifiPassed = false;
+                // location must be enabled, for get proper connected SSID
+                if ((Build.VERSION.SDK_INT < 29) || GlobalUtils.isLocationEnabled(eventsHandler.context)) {
 
-                WifiManager wifiManager = (WifiManager) eventsHandler.context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-                if (wifiManager == null) {
-                    eventsHandler.notAllowedWifi = true;
-                }
-                else {
+                    eventsHandler.wifiPassed = false;
 
-                    boolean isWifiEnabled = wifiManager.getWifiState() == WifiManager.WIFI_STATE_ENABLED;
+                    WifiManager wifiManager = (WifiManager) eventsHandler.context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+                    if (wifiManager == null) {
+                        eventsHandler.notAllowedWifi = true;
+                    } else {
 
-                    List<WifiSSIDData> wifiConfigurationList = WifiScanWorker.getWifiConfigurationList(eventsHandler.context);
+                        boolean isWifiEnabled = wifiManager.getWifiState() == WifiManager.WIFI_STATE_ENABLED;
 
-                    boolean done = false;
+                        List<WifiSSIDData> wifiConfigurationList = WifiScanWorker.getWifiConfigurationList(eventsHandler.context);
 
-                    if (isWifiEnabled) {
-                        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+                        boolean done = false;
 
-                        boolean wifiConnected = false;
+                        if (isWifiEnabled) {
+                            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
 
-                        ConnectivityManager connManager = null;
-                        try {
-                            connManager = (ConnectivityManager) eventsHandler.context.getSystemService(Context.CONNECTIVITY_SERVICE);
-                        } catch (Exception e) {
-                            // java.lang.NullPointerException: missing IConnectivityManager
-                            // Dual SIM?? Bug in Android ???
-                            PPApplicationStatic.recordException(e);
-                        }
-                        if (connManager != null) {
-                            Network[] networks = connManager.getAllNetworks();
-                            //noinspection ConstantValue,RedundantLengthCheck
-                            if ((networks != null) && (networks.length > 0)) {
-                                for (Network network : networks) {
-                                    try {
-                                        //if (Build.VERSION.SDK_INT < 28) {
+                            boolean wifiConnected = false;
+
+                            ConnectivityManager connManager = null;
+                            try {
+                                connManager = (ConnectivityManager) eventsHandler.context.getSystemService(Context.CONNECTIVITY_SERVICE);
+                            } catch (Exception e) {
+                                // java.lang.NullPointerException: missing IConnectivityManager
+                                // Dual SIM?? Bug in Android ???
+                                PPApplicationStatic.recordException(e);
+                            }
+                            if (connManager != null) {
+                                Network[] networks = connManager.getAllNetworks();
+                                //noinspection ConstantValue,RedundantLengthCheck
+                                if ((networks != null) && (networks.length > 0)) {
+                                    for (Network network : networks) {
+                                        try {
+                                            //if (Build.VERSION.SDK_INT < 28) {
                                             NetworkInfo ntkInfo = connManager.getNetworkInfo(network);
                                             if (ntkInfo != null) {
                                                 //noinspection deprecation
@@ -459,187 +509,188 @@ void doHandleEvent(EventsHandler eventsHandler, boolean forRestartEvents) {
                                                 }
                                             //}
                                         }*/
-                                    } catch (Exception e) {
+                                        } catch (Exception e) {
 //                                        Log.e("EventPreferencesWifi.doHandleEvent", Log.getStackTraceString(e));
-                                        PPApplicationStatic.recordException(e);
+                                            PPApplicationStatic.recordException(e);
+                                        }
                                     }
                                 }
                             }
-                        }
 
-                        if (wifiConnected) {
-
-                            String[] splits = _SSID.split(StringConstants.STR_SPLIT_REGEX);
-                            boolean[] connected = new boolean[splits.length];
-
-                            int i = 0;
-                            for (String _ssid : splits) {
-                                connected[i] = false;
-                                switch (_ssid) {
-                                    case EventPreferencesWifi.ALL_SSIDS_VALUE:
-                                        connected[i] = true;
-                                        break;
-                                    case EventPreferencesWifi.CONFIGURED_SSIDS_VALUE:
-                                        for (WifiSSIDData data : wifiConfigurationList) {
-                                            connected[i] = WifiScanWorker.compareSSID(wifiManager, wifiInfo, data.ssid.replace("\"", ""), wifiConfigurationList, eventsHandler.context);
-                                            if (connected[i])
-                                                break;
-                                        }
-                                        break;
-                                    default:
-                                        connected[i] = WifiScanWorker.compareSSID(wifiManager, wifiInfo, _ssid, wifiConfigurationList, eventsHandler.context);
-                                        break;
+                            if (wifiConnected) {
+
+                                String[] splits = _SSID.split(StringConstants.STR_SPLIT_REGEX);
+                                boolean[] connected = new boolean[splits.length];
+
+                                int i = 0;
+                                for (String _ssid : splits) {
+                                    connected[i] = false;
+                                    switch (_ssid) {
+                                        case EventPreferencesWifi.ALL_SSIDS_VALUE:
+                                            connected[i] = true;
+                                            break;
+                                        case EventPreferencesWifi.CONFIGURED_SSIDS_VALUE:
+                                            for (WifiSSIDData data : wifiConfigurationList) {
+                                                connected[i] = WifiScanWorker.compareSSID(wifiManager, wifiInfo, data.ssid.replace("\"", ""), wifiConfigurationList, eventsHandler.context);
+                                                if (connected[i])
+                                                    break;
+                                            }
+                                            break;
+                                        default:
+                                            connected[i] = WifiScanWorker.compareSSID(wifiManager, wifiInfo, _ssid, wifiConfigurationList, eventsHandler.context);
+                                            break;
+                                    }
+                                    i++;
                                 }
-                                i++;
-                            }
 
-                            if (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED) {
-                                eventsHandler.wifiPassed = true;
-                                for (boolean conn : connected) {
-                                    if (conn) {
-                                        eventsHandler.wifiPassed = false;
-                                        break;
+                                if (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED) {
+                                    eventsHandler.wifiPassed = true;
+                                    for (boolean conn : connected) {
+                                        if (conn) {
+                                            eventsHandler.wifiPassed = false;
+                                            break;
+                                        }
                                     }
-                                }
-                                // not use scanner data
-                                done = true;
-                            } else
-                            if ((_connectionType == EventPreferencesWifi.CTYPE_CONNECTED) ||
-                                (_connectionType == EventPreferencesWifi.CTYPE_NEARBY)) {
-                                eventsHandler.wifiPassed = false;
-                                for (boolean conn : connected) {
-                                    if (conn) {
-                                        // when is connected to configured ssid, is also nearby
-                                        eventsHandler.wifiPassed = true;
-                                        break;
+                                    // not use scanner data
+                                    done = true;
+                                } else if ((_connectionType == EventPreferencesWifi.CTYPE_CONNECTED) ||
+                                        (_connectionType == EventPreferencesWifi.CTYPE_NEARBY)) {
+                                    eventsHandler.wifiPassed = false;
+                                    for (boolean conn : connected) {
+                                        if (conn) {
+                                            // when is connected to configured ssid, is also nearby
+                                            eventsHandler.wifiPassed = true;
+                                            break;
+                                        }
                                     }
+                                    if (eventsHandler.wifiPassed)
+                                        // not use scanner data
+                                        done = true;
                                 }
-                                if (eventsHandler.wifiPassed)
+                            } else {
+                                if ((_connectionType == EventPreferencesWifi.CTYPE_CONNECTED) ||
+                                        (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED)) {
                                     // not use scanner data
                                     done = true;
+                                    eventsHandler.wifiPassed = (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED);
+                                }
                             }
                         } else {
                             if ((_connectionType == EventPreferencesWifi.CTYPE_CONNECTED) ||
-                                (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED)) {
+                                    (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED)) {
                                 // not use scanner data
                                 done = true;
                                 eventsHandler.wifiPassed = (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED);
                             }
                         }
-                    } else {
-                        if ((_connectionType == EventPreferencesWifi.CTYPE_CONNECTED) ||
-                            (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED)) {
-                            // not use scanner data
-                            done = true;
-                            eventsHandler.wifiPassed = (_connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED);
-                        }
-                    }
 
-                    if ((_connectionType == EventPreferencesWifi.CTYPE_NEARBY) ||
-                        (_connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY)) {
-                        if (!done) {
-                            if (!ApplicationPreferences.applicationEventWifiEnableScanning) {
-                                //if (forRestartEvents)
-                                //    wifiPassed = (EventPreferences.SENSOR_PASSED_PASSED & event._eventPreferencesWifi.getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
-                                //else
-                                // not allowed for disabled scanning
-                                //    notAllowedWifi = true;
-                                eventsHandler.wifiPassed = false;
-                            } else {
-                                //PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                                if (!PPApplication.isScreenOn && ApplicationPreferences.applicationEventWifiScanOnlyWhenScreenIsOn) {
-                                    if (forRestartEvents)
-                                        eventsHandler.wifiPassed = (EventPreferences.SENSOR_PASSED_PASSED & getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
-                                    else {
-                                        // not allowed for screen Off
-                                        eventsHandler.notAllowedWifi = true;
-                                    }
+                        if ((_connectionType == EventPreferencesWifi.CTYPE_NEARBY) ||
+                                (_connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY)) {
+                            if (!done) {
+                                if (!ApplicationPreferences.applicationEventWifiEnableScanning) {
+                                    //if (forRestartEvents)
+                                    //    wifiPassed = (EventPreferences.SENSOR_PASSED_PASSED & event._eventPreferencesWifi.getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
+                                    //else
+                                    // not allowed for disabled scanning
+                                    //    notAllowedWifi = true;
+                                    eventsHandler.wifiPassed = false;
                                 } else {
+                                    //PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+                                    if (!PPApplication.isScreenOn && ApplicationPreferences.applicationEventWifiScanOnlyWhenScreenIsOn) {
+                                        if (forRestartEvents)
+                                            eventsHandler.wifiPassed = (EventPreferences.SENSOR_PASSED_PASSED & getSensorPassed()) == EventPreferences.SENSOR_PASSED_PASSED;
+                                        else {
+                                            // not allowed for screen Off
+                                            eventsHandler.notAllowedWifi = true;
+                                        }
+                                    } else {
 
-                                    eventsHandler.wifiPassed = false;
+                                        eventsHandler.wifiPassed = false;
+
+                                        boolean scanningPaused = ApplicationPreferences.applicationEventWifiScanInTimeMultiply.equals("2") &&
+                                                GlobalUtils.isNowTimeBetweenTimes(
+                                                        ApplicationPreferences.applicationEventWifiScanInTimeMultiplyFrom,
+                                                        ApplicationPreferences.applicationEventWifiScanInTimeMultiplyTo);
+
+                                        if (!scanningPaused) {
+
+                                            List<WifiSSIDData> scanResults = WifiScanWorker.getScanResults(eventsHandler.context);
 
-                                    boolean scanningPaused = ApplicationPreferences.applicationEventWifiScanInTimeMultiply.equals("2") &&
-                                            GlobalUtils.isNowTimeBetweenTimes(
-                                                    ApplicationPreferences.applicationEventWifiScanInTimeMultiplyFrom,
-                                                    ApplicationPreferences.applicationEventWifiScanInTimeMultiplyTo);
-
-                                    if (!scanningPaused) {
-
-                                        List<WifiSSIDData> scanResults = WifiScanWorker.getScanResults(eventsHandler.context);
-
-                                        if (scanResults != null) {
-
-                                            for (WifiSSIDData result : scanResults) {
-                                                String[] splits = _SSID.split(StringConstants.STR_SPLIT_REGEX);
-                                                boolean[] nearby = new boolean[splits.length];
-                                                int i = 0;
-                                                for (String _ssid : splits) {
-                                                    nearby[i] = false;
-                                                    switch (_ssid) {
-                                                        case EventPreferencesWifi.ALL_SSIDS_VALUE:
-                                                            nearby[i] = true;
-                                                            break;
-                                                        case EventPreferencesWifi.CONFIGURED_SSIDS_VALUE:
-                                                            for (WifiSSIDData data : wifiConfigurationList) {
-                                                                if (WifiScanWorker.compareSSID(result, data.ssid.replace("\"", ""), wifiConfigurationList)) {
+                                            if (scanResults != null) {
+
+                                                for (WifiSSIDData result : scanResults) {
+                                                    String[] splits = _SSID.split(StringConstants.STR_SPLIT_REGEX);
+                                                    boolean[] nearby = new boolean[splits.length];
+                                                    int i = 0;
+                                                    for (String _ssid : splits) {
+                                                        nearby[i] = false;
+                                                        switch (_ssid) {
+                                                            case EventPreferencesWifi.ALL_SSIDS_VALUE:
+                                                                nearby[i] = true;
+                                                                break;
+                                                            case EventPreferencesWifi.CONFIGURED_SSIDS_VALUE:
+                                                                for (WifiSSIDData data : wifiConfigurationList) {
+                                                                    if (WifiScanWorker.compareSSID(result, data.ssid.replace("\"", ""), wifiConfigurationList)) {
+                                                                        nearby[i] = true;
+                                                                        break;
+                                                                    }
+                                                                }
+                                                                break;
+                                                            default:
+                                                                if (WifiScanWorker.compareSSID(result, _ssid, wifiConfigurationList)) {
                                                                     nearby[i] = true;
-                                                                    break;
                                                                 }
-                                                            }
-                                                            break;
-                                                        default:
-                                                            if (WifiScanWorker.compareSSID(result, _ssid, wifiConfigurationList)) {
-                                                                nearby[i] = true;
-                                                            }
-                                                            break;
+                                                                break;
+                                                        }
+                                                        i++;
                                                     }
-                                                    i++;
-                                                }
 
-                                                //noinspection ConstantConditions
-                                                done = false;
-                                                if (_connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY) {
-                                                    eventsHandler.wifiPassed = true;
-                                                    for (boolean inF : nearby) {
-                                                        if (inF) {
-                                                            done = true;
-                                                            eventsHandler.wifiPassed = false;
-                                                            break;
+                                                    //noinspection ConstantConditions
+                                                    done = false;
+                                                    if (_connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY) {
+                                                        eventsHandler.wifiPassed = true;
+                                                        for (boolean inF : nearby) {
+                                                            if (inF) {
+                                                                done = true;
+                                                                eventsHandler.wifiPassed = false;
+                                                                break;
+                                                            }
                                                         }
-                                                    }
-                                                } else {
-                                                    eventsHandler.wifiPassed = false;
-                                                    for (boolean inF : nearby) {
-                                                        if (inF) {
-                                                            done = true;
-                                                            eventsHandler.wifiPassed = true;
-                                                            break;
+                                                    } else {
+                                                        eventsHandler.wifiPassed = false;
+                                                        for (boolean inF : nearby) {
+                                                            if (inF) {
+                                                                done = true;
+                                                                eventsHandler.wifiPassed = true;
+                                                                break;
+                                                            }
                                                         }
                                                     }
+                                                    if (done)
+                                                        break;
                                                 }
-                                                if (done)
-                                                    break;
-                                            }
 
-                                            if (!done) {
-                                                if (scanResults.isEmpty()) {
+                                                if (!done) {
+                                                    if (scanResults.isEmpty()) {
 
-                                                    if (_connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY)
-                                                        eventsHandler.wifiPassed = true;
+                                                        if (_connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY)
+                                                            eventsHandler.wifiPassed = true;
 
+                                                    }
                                                 }
-                                            }
 
-                                        } else {
-                                            // not allowed, no scan results
-                                            eventsHandler.notAllowedWifi = true;
+                                            } else {
+                                                // not allowed, no scan results
+                                                eventsHandler.notAllowedWifi = true;
+                                            }
                                         }
                                     }
                                 }
                             }
                         }
                     }
-                }
+                } else
+                    eventsHandler.wifiPassed = false;
 
                 if (!eventsHandler.notAllowedWifi) {
                     if (eventsHandler.wifiPassed)
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventStatic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventStatic.java
index 1e5db1ae92..3a978f830a 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventStatic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventStatic.java
@@ -2,9 +2,16 @@
 
 import android.Manifest;
 import android.app.ActivityManager;
+import android.app.KeyguardManager;
+import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences.Editor;
+import android.location.LocationManager;
+import android.media.AudioManager;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+import android.nfc.NfcAdapter;
 import android.os.Build;
 import android.os.PowerManager;
 import android.telephony.TelephonyManager;
@@ -19,6 +26,10 @@
 /** @noinspection ExtractMethodRecommender*/
 class EventStatic {
 
+    private EventStatic() {
+        // private constructor to prevent instantiation
+    }
+
     static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context context)
     {
         Context appContext = context.getApplicationContext();
@@ -36,9 +47,14 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
 
         if (preferenceKey.equals(EventPreferencesWifi.PREF_EVENT_WIFI_ENABLED))
         {
-            if (PPApplication.HAS_FEATURE_WIFI)
+            if (PPApplication.HAS_FEATURE_WIFI) {
                 // device has Wifi
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+                WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+                if (wifiManager == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
@@ -50,13 +66,17 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
         {
             if (PPApplication.HAS_FEATURE_BLUETOOTH) {
                 // device has bluetooth
-                if (Permissions.hasPermission(context, Manifest.permission.BLUETOOTH) &&
-                    (Permissions.hasPermission(context, Manifest.permission.BLUETOOTH_ADMIN)))
-                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
-                else {
+                BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter(); //BluetoothScanWorker.getBluetoothAdapter(context);
+                if (bluetooth != null) {
+                    if (Permissions.hasPermission(context, Manifest.permission.BLUETOOTH) &&
+                            (Permissions.hasPermission(context, Manifest.permission.BLUETOOTH_ADMIN)))
+                        preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+                    else {
+                        preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                        preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_not_granted_bluetooth_permission);
+                    }
+                } else
                     preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
-                    preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_not_granted_bluetooth_permission);
-                }
             }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
@@ -149,9 +169,14 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
 
         if (preferenceKey.equals(EventPreferencesNFC.PREF_EVENT_NFC_ENABLED))
         {
-            if (PPApplication.HAS_FEATURE_NFC)
+            if (PPApplication.HAS_FEATURE_NFC) {
                 // device has nfc
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+                NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
+                if (nfcAdapter == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
@@ -231,9 +256,14 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
 
         if (preferenceKey.equals(EventPreferencesLocation.PREF_EVENT_LOCATION_ENABLED))
         {
-            if (PPApplication.HAS_FEATURE_LOCATION)
+            if (PPApplication.HAS_FEATURE_LOCATION) {
                 // device has location
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+                LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+                if (locationManager == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
@@ -287,15 +317,25 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
         //    return preferenceAllowed;
 
         if (preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_WIFI)) {
-            if (PPApplication.HAS_FEATURE_WIFI)
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            if (PPApplication.HAS_FEATURE_WIFI) {
+                WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+                if (wifiManager == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
         }
         if (preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_BLUETOOTH)) {
-            if (PPApplication.HAS_FEATURE_BLUETOOTH)
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            if (PPApplication.HAS_FEATURE_BLUETOOTH) {
+                BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); //BluetoothScanWorker.getBluetoothAdapter(context);
+                if (bluetoothAdapter == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
@@ -306,9 +346,19 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
                 preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_NO_CHECK_SIM)*/) {
             if (PPApplication.HAS_FEATURE_TELEPHONY) {
                 // device has telephony
-                TelephonyManager telephonyManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
-                if (telephonyManager != null) {
-                    //if (!preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_NO_CHECK_SIM)) {
+
+                ConnectivityManager connManager = null;
+                try {
+                    connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+                } catch (Exception e) {
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                }
+                if (connManager == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else {
+                    TelephonyManager telephonyManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
+                    if (telephonyManager != null) {
+                        //if (!preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_NO_CHECK_SIM)) {
 //                    Log.e("EventStatic.isEventPreferenceAllowed", "("+preferenceKey+") called hasSIMCard");
                         HasSIMCardData hasSIMCardData = GlobalUtils.hasSIMCard(context);
                         boolean simExists;
@@ -322,31 +372,40 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
                             if (!Permissions.checkPhone(appContext)) {
                                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_GRANTED_PHONE_PERMISSION;
                                 preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_not_granted_phone_permission);
-                            }
-                            else
+                            } else
                                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_SIM_CARD;
                         }
-                    //}
-                    //else
-                    //    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+                        //}
+                        //else
+                        //    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+                    } else
+                        preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                 }
-                else
-                    preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
         }
         if (preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_GPS)) {
-            if (PPApplication.HAS_FEATURE_LOCATION_GPS)
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            if (PPApplication.HAS_FEATURE_LOCATION_GPS) {
+                LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+                if (locationManager == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
         }
         if (preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_NFC)) {
-            if (PPApplication.HAS_FEATURE_NFC)
-                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            if (PPApplication.HAS_FEATURE_NFC) {
+                NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(context);
+                if (nfcAdapter == null)
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+                else
+                    preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            }
             else
                 preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
             return preferenceAllowed;
@@ -356,39 +415,22 @@ static PreferenceAllowed isEventPreferenceAllowed(String preferenceKey, Context
             preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
             return preferenceAllowed;
         }
-
-        /*
-        if (preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED) ||
-                preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED_NO_CHECK_SIM))
-        {
-            if (PPApplication.HAS_FEATURE_TELEPHONY) {
-                // device has telephony
-                TelephonyManager telephonyManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
-                if (telephonyManager != null) {
-                    if (preferenceKey.equals(EventPreferencesRadioSwitch.PREF_EVENT_RADIO_SWITCH_ENABLED)) {
-                        boolean simExists = GlobalUtils.hasSIMCard(context, 0);
-                        if (simExists)
-                            preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
-                        else {
-                            if (!Permissions.checkPhone(appContext)) {
-                                preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_GRANTED_PHONE_PERMISSION;
-                                preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_not_granted_phone_permission);
-                            }
-                            else
-                                preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_SIM_CARD;
-                        }
-                    }
-                    else
-                        preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
-                }
-                else
-                    preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
-            }
+        if (preferenceKey.equals(EventPreferencesMusic.PREF_EVENT_MUSIC_ENABLED)) {
+            AudioManager audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
+            if (audioManager == null)
+                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
             else
-                preferenceAllowed.notAllowedReason = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
+                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
+            return preferenceAllowed;
+        }
+        if (preferenceKey.equals(EventPreferencesScreen.PREF_EVENT_SCREEN_ENABLED)) {
+            KeyguardManager kgMgr = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+            if (kgMgr == null)
+                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
+            else
+                preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
             return preferenceAllowed;
         }
-        */
 
         preferenceAllowed.allowed = PreferenceAllowed.PREFERENCE_ALLOWED;
         return preferenceAllowed;
@@ -684,7 +726,8 @@ static boolean isRedTextNotificationRequired(Event event, boolean againCheckInDe
         }*/
         boolean accessibilityEnabled =  event.isAccessibilityServiceEnabled(appContext, false, againCheckInDelay) == 1;
 
-        boolean eventIsRunnable = event.isRunnable(appContext, false);
+        boolean eventIsRunnable = event.isRunnable(appContext, false) &&
+                                    event.isAllConfigured(appContext, false);
 
         return ((!enabledSomeSensor) || (!grantedAllPermissions) || (!accessibilityEnabled) || (!eventIsRunnable));
     }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsHandler.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsHandler.java
index 56abd2072b..941709cdad 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsHandler.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsHandler.java
@@ -209,15 +209,15 @@ void handleEvents(int[] sensorType) {
                     break;
             }
             switch (ActivateProfileHelper.getSystemZenMode(context)) {
-                case ActivateProfileHelper.ZENMODE_ALARMS:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_ALARMS:
                     oldZenMode = Profile.ZENMODE_ALARMS;
 //                    PPApplicationStatic.logE("[RINGING_SIMULATION] EventsHandler.handleEvents", "oldZenMode=ALARMS");
                     break;
-                case ActivateProfileHelper.ZENMODE_NONE:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_NONE:
                     oldZenMode = Profile.ZENMODE_NONE;
 //                    PPApplicationStatic.logE("[RINGING_SIMULATION] EventsHandler.handleEvents", "oldZenMode=NONE");
                     break;
-                case ActivateProfileHelper.ZENMODE_PRIORITY:
+                case ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY:
                     oldZenMode = Profile.ZENMODE_PRIORITY;
 //                    PPApplicationStatic.logE("[RINGING_SIMULATION] EventsHandler.handleEvents", "oldZenMode=PRIORITY");
                     break;
@@ -350,7 +350,8 @@ void handleEvents(int[] sensorType) {
                 // search for calendar events
                 for (Event _event : dataWrapper.eventList) {
                     if ((_event._eventPreferencesCalendar._enabled) && (_event.getStatus() != Event.ESTATUS_STOP)) {
-                        if (_event._eventPreferencesCalendar.isRunnable(context)) {
+                        if (_event._eventPreferencesCalendar.isRunnable(context) &&
+                            _event._eventPreferencesCalendar.isAllConfigured(context)) {
                             _event._eventPreferencesCalendar.saveCalendarEventExists(dataWrapper);
                             _event._eventPreferencesCalendar.saveStartEndTime(dataWrapper);
                         }
@@ -1021,7 +1022,9 @@ private void doEndHandler(DataWrapper dataWrapper, Profile mergedProfile) {
                     }
                     int simSlot = ApplicationPreferences.prefEventCallRunAfterCallEndFromSIMSlot;
 //                    PPApplicationStatic.logE("[RINGING_SIMULATION] EventsHandler.doEndHandler", "simulateRingingCall="+simulateRingingCall);
-                    if (simulateRingingCall) {
+                    if (simulateRingingCall && (!mergedProfile._volumeMuteSound)) {
+                        // in profile is not enabled mute sound, do simulation
+
                         Intent commandIntent = new Intent(PhoneProfilesService.ACTION_COMMAND);
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_SIMULATE_RINGING_CALL, true);
                         // add saved ringer mode, zen mode, ringtone before handle events as parameters
@@ -1034,7 +1037,6 @@ private void doEndHandler(DataWrapper dataWrapper, Profile mergedProfile) {
                         //commandIntent.putExtra(PhoneProfilesService.EXTRA_OLD_RINGTONE_SIM1, oldRingtoneSIM1);
                         //commandIntent.putExtra(PhoneProfilesService.EXTRA_OLD_RINGTONE_SIM2, oldRingtoneSIM2);
                         //commandIntent.putExtra(PhoneProfilesService.EXTRA_OLD_SYSTEM_RINGER_VOLUME, oldSystemRingerVolume);
-
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_NEW_RINGER_MODE, mergedProfile._volumeRingerMode);
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_NEW_ZEN_MODE, mergedProfile._volumeZenMode);
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_NEW_RINGER_VOLUME, mergedProfile._volumeRingtone);
@@ -1044,8 +1046,8 @@ private void doEndHandler(DataWrapper dataWrapper, Profile mergedProfile) {
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_NEW_RINGTONE_SIM1, mergedProfile._soundRingtoneSIM1);
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_NEW_RINTONE_CHANGE_SIM2, mergedProfile._soundRingtoneChangeSIM2);
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_NEW_RINGTONE_SIM2, mergedProfile._soundRingtoneSIM2);
-
                         commandIntent.putExtra(PhoneProfilesService.EXTRA_CALL_FROM_SIM_SLOT, simSlot);
+
                         PPApplicationStatic.runCommand(context, commandIntent);
                     }
                 } catch (Exception e) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsPrefsFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsPrefsFragment.java
index af6882df7b..27f543be58 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsPrefsFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/EventsPrefsFragment.java
@@ -25,9 +25,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.ShortcutInfoCompat;
@@ -65,6 +67,7 @@ public class EventsPrefsFragment extends PreferenceFragmentCompat
 
     private static final String PREF_GRANT_PERMISSIONS = "eventGrantPermissions";
     private static final String PREF_NOT_IS_RUNNABLE = "eventNotIsRunnable";
+    private static final String PREF_NOT_IS_ALL_CONFIGURED = "eventNotIsAllConfigured";
     private static final String PREF_NOT_ENABLED_SOME_SENSOR = "eventNotEnabledSomeSensors";
     private static final String PREF_NOT_ENABLED_ACCESSIBILITY_SERVICE = "eventNotEnabledAccessibilityService";
     private static final String PREF_EVENT_SENSORS_INFO = "eventSensorsInfo";
@@ -1243,33 +1246,56 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
                     preference.setVisible(true);
                     preference.setOnPreferenceClickListener(preference120 -> {
-                        Intent shortcutIntent = new Intent(appContext, NFCTagReadForegroundActivity.class);
-                        //shortcutIntent.setAction(Intent.ACTION_MAIN);
-                        shortcutIntent.setAction(NfcAdapter.ACTION_NDEF_DISCOVERED);
-                        //<data android:mimeType="application/vnd.phoneprofilesplus.events"/>
-                        //shortcutIntent.setData(Uri.parse("android:mimeType=\"application/vnd.phoneprofilesplus.events\""));
-                        shortcutIntent.setType("application/vnd.phoneprofilesplus.events");
-                        shortcutIntent.addCategory(Intent.CATEGORY_DEFAULT);
-                        shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-                        ShortcutInfoCompat.Builder shortcutBuilderCompat = new ShortcutInfoCompat.Builder(appContext, EventPreferencesNFC.SHORTCUT_ID_READ_NFC_TAG);
-                        shortcutBuilderCompat.setIntent(shortcutIntent);
-                        shortcutBuilderCompat.setShortLabel(getString(R.string.nfc_tag_pref_dlg_readNfcTag_title));
-                        shortcutBuilderCompat.setLongLabel(getString(R.string.nfc_tag_pref_dlg_readNfcTag_text));
-                        shortcutBuilderCompat.setIcon(IconCompat.createWithResource(appContext, R.mipmap.ic_read_nfc_tag));
-
-                        try {
-                            Intent pinnedShortcutCallbackIntent = new Intent(EventPreferencesNFC.ACTION_SHORTCUT_TO_READ_NFC_TAG_ADDED);
-                            PendingIntent successCallback = PendingIntent.getBroadcast(appContext, 10, pinnedShortcutCallbackIntent,  0);
-
-                            ShortcutInfoCompat shortcutInfo = shortcutBuilderCompat.build();
-                            ShortcutManagerCompat.requestPinShortcut(appContext, shortcutInfo, successCallback.getIntentSender());
-                            //fragment.getActivity().setResult(Activity.RESULT_OK, intent);
-                        } catch (Exception e) {
-                            // show dialog about this crash
-                            // for Microsft laucher it is:
-                            // java.lang.IllegalArgumentException ... already exists but disabled
-                        }
+                        PPEditTextAlertDialog editTextDialog = new PPEditTextAlertDialog(
+                                getString(R.string.shortcut_to_read_nfc_tag_dialog_title),
+                                getString(R.string.shortcut_to_dialog_lablel),
+                                getString(R.string.read_nfc_tag_short_shortcut_name),
+                                getString(R.string.shortcut_to_dialog_create_button),
+                                getString(android.R.string.cancel),
+                                (dialog1, which) -> {
+                                    String iconName = "";
+                                    AlertDialog dialog = (AlertDialog) dialog1;
+                                    EditText editText = dialog.findViewById(R.id.dialog_with_edittext_edit);
+                                    if (editText != null)
+                                        iconName = editText.getText().toString();
+                                    if (iconName.isEmpty())
+                                        iconName = getString(R.string.read_nfc_tag_short_shortcut_name);
+                                    //Log.e("PhoneProfilesPrefsFragment createEditorShortcut", "iconName="+iconName);
+
+                                    Intent shortcutIntent = new Intent(appContext, NFCTagReadForegroundActivity.class);
+                                    //shortcutIntent.setAction(Intent.ACTION_MAIN);
+                                    shortcutIntent.setAction(NfcAdapter.ACTION_NDEF_DISCOVERED);
+                                    //<data android:mimeType="application/vnd.phoneprofilesplus.events"/>
+                                    //shortcutIntent.setData(Uri.parse("android:mimeType=\"application/vnd.phoneprofilesplus.events\""));
+                                    shortcutIntent.setType("application/vnd.phoneprofilesplus.events");
+                                    shortcutIntent.addCategory(Intent.CATEGORY_DEFAULT);
+                                    shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+                                    ShortcutInfoCompat.Builder shortcutBuilderCompat = new ShortcutInfoCompat.Builder(appContext, EventPreferencesNFC.SHORTCUT_ID_READ_NFC_TAG);
+                                    shortcutBuilderCompat.setIntent(shortcutIntent);
+                                    shortcutBuilderCompat.setShortLabel(iconName);
+                                    shortcutBuilderCompat.setLongLabel(getString(R.string.nfc_tag_pref_dlg_readNfcTag_text));
+                                    shortcutBuilderCompat.setIcon(IconCompat.createWithResource(appContext, R.mipmap.ic_read_nfc_tag));
+
+                                    try {
+                                        Intent pinnedShortcutCallbackIntent = new Intent(EventPreferencesNFC.ACTION_SHORTCUT_TO_READ_NFC_TAG_ADDED);
+                                        PendingIntent successCallback = PendingIntent.getBroadcast(appContext, 10, pinnedShortcutCallbackIntent,  0);
+
+                                        ShortcutInfoCompat shortcutInfo = shortcutBuilderCompat.build();
+                                        ShortcutManagerCompat.requestPinShortcut(appContext, shortcutInfo, successCallback.getIntentSender());
+                                        //fragment.getActivity().setResult(Activity.RESULT_OK, intent);
+                                    } catch (Exception e) {
+                                        // show dialog about this crash
+                                        // for Microsft laucher it is:
+                                        // java.lang.IllegalArgumentException ... already exists but disabled
+                                    }
+                                },
+                                null, null,
+                                true, true, false,
+                                activity
+                        );
+                        if (!activity.isFinishing())
+                            editTextDialog.show();
 
                         return false;
                     });
@@ -2280,6 +2306,7 @@ private static class SetRedTextToPreferencesAsyncTask extends AsyncTask<Void, In
         boolean isEnabledSomeSensor;
         ArrayList<PermissionType> eventPermissions;
         boolean eventIsRunnable;
+        boolean eventIsAllConfigured;
         int accessibilityEnabled;
 
         private final WeakReference<PreferenceManager> prefMngWeakRef;
@@ -2314,6 +2341,7 @@ protected Void doInBackground(Void... params) {
                     eventPermissions = Permissions.checkEventPermissions(context, event, null, EventsHandler.SENSOR_TYPE_ALL);
                     accessibilityEnabled = event.isAccessibilityServiceEnabled(context, false, false);
                     eventIsRunnable = event.isRunnable(context, false);
+                    eventIsAllConfigured = event.isAllConfigured(context, false);
                 }
             }
 
@@ -2518,6 +2546,43 @@ else if (accessibilityEnabled == -1)
                             preference.setSummary(summary);
                         }
                     }
+
+                    // not is configures some parameter
+                    if (eventIsAllConfigured) {
+                        preference = prefMng.findPreference(PREF_NOT_IS_ALL_CONFIGURED);
+                        if (preference != null) {
+                            PreferenceScreen preferenceCategory = fragment.findPreference(rootScreen);
+                            if (preferenceCategory != null)
+                                preferenceCategory.removePreference(preference);
+                        }
+                    }
+                    else {
+                        preference = prefMng.findPreference(PREF_NOT_IS_ALL_CONFIGURED);
+                        if (preference == null) {
+                            PreferenceScreen preferenceCategory = fragment.findPreference(rootScreen);
+                            if (preferenceCategory != null) {
+                                preference = new ExclamationPreference(context);
+                                preference.setKey(PREF_NOT_IS_ALL_CONFIGURED);
+                                preference.setIconSpaceReserved(false);
+                                preference.setLayoutResource(R.layout.mp_preference_material_widget);
+                                preference.setOrder(-100);
+                                preferenceCategory.addPreference(preference);
+                            }
+                        }
+                        if (preference != null) {
+                            String _title = order + ". " + context.getString(R.string.event_preferences_not_all_parameters_are_configured);
+                            ++order;
+                            Spannable title = new SpannableString(_title);
+                            title.setSpan(new ForegroundColorSpan(errorColor), 0, title.length(), 0);
+                            preference.setTitle(title);
+                            _title = context.getString(R.string.event_preferences_not_all_parameters_are_configured_summary) + " " +
+                                    //context.getString(R.string.event_preferences_red_sensors_summary) + " " +
+                                    context.getString(R.string.event_preferences_sensor_parameters_location_summary);
+                            Spannable summary = new SpannableString(_title);
+                            summary.setSpan(new ForegroundColorSpan(errorColor), 0, summary.length(), 0);
+                            preference.setSummary(summary);
+                        }
+                    }
                 }
                 else {
                     Preference preference = prefMng.findPreference(PREF_NOT_IS_RUNNABLE);
@@ -2526,6 +2591,12 @@ else if (accessibilityEnabled == -1)
                         if (preferenceCategory != null)
                             preferenceCategory.removePreference(preference);
                     }
+                    preference = prefMng.findPreference(PREF_NOT_IS_ALL_CONFIGURED);
+                    if (preference != null) {
+                        PreferenceScreen preferenceCategory = fragment.findPreference(rootScreen);
+                        if (preferenceCategory != null)
+                            preferenceCategory.removePreference(preference);
+                    }
                     preference = prefMng.findPreference(PREF_NOT_ENABLED_SOME_SENSOR);
                     if (preference != null) {
                         PreferenceScreen preferenceCategory = fragment.findPreference(rootScreen);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ExtenderDialogPreferenceFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ExtenderDialogPreferenceFragment.java
index 4eed2884ce..982017adb4 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ExtenderDialogPreferenceFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ExtenderDialogPreferenceFragment.java
@@ -293,17 +293,52 @@ public void onClick(@NonNull View textView) {
             //String url = PPApplication.GITHUB_PPPE_DOWNLOAD_URL_1 + PPApplication.VERSION_NAME_EXTENDER_LATEST + PPApplication.GITHUB_PPPE_DOWNLOAD_URL_2;
             String url = PPApplication.GITHUB_PPPE_DOWNLOAD_URL;
 
-            Intent i = new Intent(Intent.ACTION_VIEW);
-            i.setData(Uri.parse(url));
-            try {
-                activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
-                if ((_preference != null) && (_preference.fragment != null))
-                    _preference.fragment.dismiss();
-            } catch (Exception e) {
-                PPApplicationStatic.recordException(e);
-                if ((_preference != null) && (_preference.fragment != null))
-                    _preference.fragment.dismiss();
-            }
+            // DownloadManager not working in Huawei P40
+            // https://stackoverflow.com/questions/44093939/how-to-use-downloadmanager-on-huawei
+            //if (PPApplication.deviceIsHuawei && PPApplication.romIsEMUI) {
+                Intent i = new Intent(Intent.ACTION_VIEW);
+                i.setData(Uri.parse(url));
+                i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                try {
+                    activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    if ((_preference != null) && (_preference.fragment != null))
+                        _preference.fragment.dismiss();
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                    if ((_preference != null) && (_preference.fragment != null))
+                        _preference.fragment.dismiss();
+                }
+            /*} else {
+                try {
+                    String textToast = activity.getString(R.string.downloading_toast_text);
+                    PPApplication.showToast(activity.getApplicationContext(), textToast, Toast.LENGTH_LONG);
+
+                    Uri Download_Uri = Uri.parse(url);
+                    DownloadManager.Request request = new DownloadManager.Request(Download_Uri);
+
+                    //Restrict the types of networks over which this download may proceed.
+                    request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE);
+                    //Set whether this download may proceed over a roaming connection.
+                    request.setAllowedOverRoaming(false);
+                    //Set the title of this download, to be displayed in notifications (if enabled).
+                    request.setTitle(activity.getString(R.string.download_PPPE_title));
+                    //Set a description of this download, to be displayed in notifications (if enabled)
+                    request.setDescription(activity.getString(R.string.downloading_file_description));
+                    //Set the local destination for the downloaded file to a path within the application's external files directory
+                    request.setDestinationInExternalPublicDir(DIRECTORY_DOWNLOADS, "PhoneProfilesPlusExtender.apk");
+                    //request.allowScanningByMediaScanner();
+                    request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                    //Enqueue a new download and same the referenceId
+                    DownloadManager downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
+                    DownloadCompletedBroadcastReceiver.downloadReferencePPPE = downloadManager.enqueue(request);
+                    if ((_preference != null) && (_preference.fragment != null))
+                        _preference.fragment.dismiss();
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                    if ((_preference != null) && (_preference.fragment != null))
+                        _preference.fragment.dismiss();
+                }
+            }*/
         });
         dialogBuilder.setNegativeButton(android.R.string.cancel, (dialog, which) -> {
             if (finishActivity)
@@ -408,13 +443,15 @@ static void installPPPExtender(final Activity activity, final ExtenderDialogPref
         boolean fdroidInstalled = (_intent != null);
         _intent = packageManager.getLaunchIntentForPackage(PPApplication.DROIDIFY_PACKAGE_NAME);
         boolean droidifyInstalled = (_intent != null);
+        _intent = packageManager.getLaunchIntentForPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+        boolean neostoreInstalled = (_intent != null);
         //_intent = packageManager.getLaunchIntentForPackage(PPApplication.GALAXY_STORE_PACKAGE_NAME);
         //boolean galaxyStoreInstalled = (_intent != null);
 //        Log.e("ExtenderDialogPreferenceFragment.installPPPExtender", "fdroidInstalled="+fdroidInstalled);
 //        Log.e("ExtenderDialogPreferenceFragment.installPPPExtender", "droidifyInstalled="+droidifyInstalled);
 //        Log.e("ExtenderDialogPreferenceFragment.installPPPExtender", "galaxyStoreInstalled="+galaxyStoreInstalled);
 
-        if (droidifyInstalled || fdroidInstalled /*|| galaxyStoreInstalled*/) {
+        if (droidifyInstalled || neostoreInstalled || fdroidInstalled /*|| galaxyStoreInstalled*/) {
             AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
             dialogBuilder.setTitle(R.string.install_extender_dialog_title);
 
@@ -493,6 +530,21 @@ public void onClick(@NonNull View textView) {
                         if (finishActivity)
                             activity.finish();
                     }
+                } else if (neostoreInstalled) {
+                    intent.setPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+                    try {
+                        activity.startActivity(intent);
+                        if ((_preference != null) && (_preference.fragment != null))
+                            _preference.fragment.dismiss();
+                        if (finishActivity)
+                            activity.finish();
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                        if ((_preference != null) && (_preference.fragment != null))
+                            _preference.fragment.dismiss();
+                        if (finishActivity)
+                            activity.finish();
+                    }
                 } else /*if (fdroidInstalled)*/ {
                     intent.setPackage(PPApplication.FDROID_PACKAGE_NAME);
                     try {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GenerateNotificationDialogPreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GenerateNotificationDialogPreference.java
index c7adde47ed..b65aaf1b37 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GenerateNotificationDialogPreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GenerateNotificationDialogPreference.java
@@ -75,11 +75,13 @@ private void getValueGNDP()
         } catch (Exception e) {
             iconType = 0;
         }
+        //noinspection UnreachableCode
         try {
             notificationTitle = splits[2];
         } catch (Exception e) {
             notificationTitle = "";
         }
+        //noinspection UnreachableCode
         try {
             notificationBody = splits[3];
         } catch (Exception e) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalGUIRoutines.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalGUIRoutines.java
index 30e4b45bef..bfea818a09 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalGUIRoutines.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalGUIRoutines.java
@@ -50,6 +50,10 @@ class GlobalGUIRoutines {
     static final String OPAQUENESS_LIGHTNESS_87 = "87";
     static final String OPAQUENESS_LIGHTNESS_100 = "100";
 
+    private GlobalGUIRoutines() {
+        // private constructor to prevent instantiation
+    }
+
     static void setTheme(Activity activity, boolean forPopup,
                                 boolean withToolbar,
                                 /*boolean forEditor,*/ boolean forActivator, boolean forDialog,
@@ -1013,6 +1017,7 @@ static void showDialogAboutRedText(final Profile profile, final Event event,
         }
     }
 
+    /*
     static Intent getIntentForStartupSource(Context context, int startupSource) {
         Intent intentLaunch;
 
@@ -1029,10 +1034,10 @@ static Intent getIntentForStartupSource(Context context, int startupSource) {
                 else
                     intentLaunch = new Intent(context.getApplicationContext(), EditorActivity.class);
                 break;
-            case PPApplication.STARTUP_SOURCE_EDITOR_WIDGET_HEADER:
-                intentLaunch = new Intent(context.getApplicationContext(), EditorActivity.class);
-                //startupSource = PPApplication.STARTUP_SOURCE_WIDGET;
-                break;
+//            case PPApplication.STARTUP_SOURCE_EDITOR_WIDGET_HEADER:
+//                intentLaunch = new Intent(context.getApplicationContext(), EditorActivity.class);
+//                //startupSource = PPApplication.STARTUP_SOURCE_WIDGET;
+//                break;
             default:
                 //if (ApplicationPreferences.applicationHomeLauncher.equals("activator"))
                     intentLaunch = new Intent(context.getApplicationContext(), ActivatorActivity.class);
@@ -1042,5 +1047,6 @@ static Intent getIntentForStartupSource(Context context, int startupSource) {
         }
         return intentLaunch;
     }
+    */
 
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalUtils.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalUtils.java
index 479de9fe83..390e811eb6 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalUtils.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GlobalUtils.java
@@ -3,6 +3,8 @@
 import android.Manifest;
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Build;
@@ -11,6 +13,16 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.StyleSpan;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
 
 import java.text.Collator;
 import java.util.Calendar;
@@ -19,6 +31,10 @@
 
 class GlobalUtils {
 
+    private GlobalUtils() {
+        // private constructor to prevent instantiation
+    }
+
     static void switchKeyguard(Context context) {
 //        PPApplicationStatic.logE("[IN_THREAD_HANDLER] GlobalUtils.switchKeyguard", "********");
 
@@ -517,4 +533,72 @@ static int getSIMCardFromSubscriptionId(Context appContext, int subscriptionId)
         return -1;
     }
 
+    /** @noinspection SameParameterValue*/
+    static void emailMe(final TextView textView, final String text, final String linkText, final String subjectText,
+                        final String bodyText, /*final boolean boldLink,*/ final Context context) {
+        String strNoLink = text + " " + linkText;
+        String str2 = strNoLink + StringConstants.CHAR_NEW_LINE + StringConstants.AUTHOR_EMAIL + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
+        Spannable sbt = new SpannableString(str2);
+        sbt.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, strNoLink.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        ClickableSpan clickableSpan = new ClickableSpan() {
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setColor(ds.linkColor);    // you can use custom color
+                ds.setUnderlineText(false);    // this remove the underline
+            }
+
+            @Override
+            public void onClick(@NonNull View textView) {
+                Intent intent = new Intent(Intent.ACTION_SENDTO);
+                intent.setData(Uri.parse(StringConstants.INTENT_DATA_MAIL_TO_COLON)); // only email apps should handle this
+                String[] email = { StringConstants.AUTHOR_EMAIL };
+                intent.putExtra(Intent.EXTRA_EMAIL, email);
+                String packageVersion = "";
+                try {
+                    PackageInfo pInfo = context.getPackageManager().getPackageInfo(PPApplication.PACKAGE_NAME, 0);
+                    packageVersion = " - v" + pInfo.versionName + " (" + PPApplicationStatic.getVersionCode(pInfo) + ")";
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                }
+                if (subjectText.isEmpty())
+                    intent.putExtra(Intent.EXTRA_SUBJECT, StringConstants.PHONE_PROFILES_PLUS + packageVersion);
+                else
+                    intent.putExtra(Intent.EXTRA_SUBJECT, StringConstants.PHONE_PROFILES_PLUS + packageVersion + " - " + subjectText);
+                if (!bodyText.isEmpty())
+                    intent.putExtra(Intent.EXTRA_TEXT, bodyText);
+                try {
+                    context.startActivity(Intent.createChooser(intent, context.getString(R.string.email_chooser)));
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                }
+            }
+        };
+        sbt.setSpan(clickableSpan, strNoLink.length()+1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //if (boldLink)
+        sbt.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), strNoLink.length()+1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //else
+        //    sbt.setSpan(new UnderlineSpan(), strNoLink.length()+1, str2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        textView.setText(sbt);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    static String getEmailBodyText(/*int bodyType, */Context context) {
+        String body;
+        //switch (bodyType) {
+        //    case EMAIL_BODY_SUPPORT:
+        body = context.getString(R.string.important_info_email_body_device) + " " +
+                Settings.Global.getString(context.getContentResolver(), Settings.Global.DEVICE_NAME) +
+                " (" + Build.MODEL + ")" + StringConstants.STR_NEWLINE_WITH_SPACE;
+        body = body + context.getString(R.string.important_info_email_body_android_version) + " " + Build.VERSION.RELEASE + StringConstants.STR_DOUBLE_NEWLINE_WITH_SPACE;
+        body = body + context.getString(R.string.important_info_email_body_problems) + StringConstants.STR_NEWLINE_WITH_SPACE;
+        body = body + context.getString(R.string.important_info_email_body_questions) + StringConstants.STR_NEWLINE_WITH_SPACE;
+        body = body + context.getString(R.string.important_info_email_body_suggestions) + StringConstants.STR_DOUBLE_NEWLINE_WITH_SPACE;
+        /*        break;
+            case EMAIL_BODY_TRANSLATIONS:
+                body = context.getString(R.string.important_info_email_body_translation_language_to) + StringConstants.STR_DOUBLE_NEWLINE_WITH_SPACE;
+                break;
+        }*/
+        return body;
+    }
+
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GrantShizukuPermissionActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GrantShizukuPermissionActivity.java
index 5b92a1cbc0..0b95a41e30 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GrantShizukuPermissionActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/GrantShizukuPermissionActivity.java
@@ -7,6 +7,12 @@
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.work.Data;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkManager;
+
+import java.util.concurrent.TimeUnit;
 
 import rikka.shizuku.Shizuku;
 
@@ -19,6 +25,7 @@ private void onRequestPermissionsResult(int requestCode, int grantResult) {
         boolean granted = grantResult == PackageManager.PERMISSION_GRANTED;
         //Log.e("GrantShizukuPermissionActivity.onRequestPermissionsResult", "granted="+granted);
         if (granted) {
+            PPApplicationStatic.logE("GrantShizukuPermissionActivity.onRequestPermissionsResult", "*** Shizuku granted ***");
             Runnable runnable = () -> {
                 RootUtils.settingsBinaryExists(false);
                 RootUtils.serviceBinaryExists(false);
@@ -26,6 +33,54 @@ private void onRequestPermissionsResult(int requestCode, int grantResult) {
                 RootUtils.getServicesList();
                 ApplicationPreferences.applicationHyperOsWifiBluetoothDialogs(getApplicationContext());
                 Permissions.setHyperOSWifiBluetoothDialogAppOp();
+
+                // do activate profile/restart events aso for first start
+                Data workData = new Data.Builder()
+                        .putBoolean(PhoneProfilesService.EXTRA_ACTIVATE_PROFILES, true)
+
+                        .putBoolean(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APPLICATION, false)
+                        .putString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_ACTION, "")
+                        .putInt(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_TYPE, 0)
+                        .putString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_VALUE, "")
+
+                        .putBoolean(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, true)
+
+                        //.putBoolean(PhoneProfilesService.EXTRA_SHOW_TOAST, serviceIntent != null)
+                        .build();
+
+//                PPApplicationStatic.logE("[MAIN_WORKER_CALL] PhoneProfilesService.doForFirstStart", "xxxxxxxxxxxxxxxxxxxx");
+
+                OneTimeWorkRequest worker =
+                        new OneTimeWorkRequest.Builder(MainWorker.class)
+                                .addTag(PPApplication.AFTER_SHIZUKU_START_WORK_TAG)
+                                .setInputData(workData)
+
+                                .setInitialDelay(10, TimeUnit.SECONDS)
+
+                                .keepResultsForAtLeast(PPApplication.WORK_PRUNE_DELAY_MINUTES, TimeUnit.MINUTES)
+                                .build();
+                try {
+                    WorkManager workManager = PPApplication.getWorkManagerInstance();
+                    if (workManager != null) {
+
+//                                        //if (PPApplicationStatic.logEnabled()) {
+//                                        ListenableFuture<List<WorkInfo>> statuses;
+//                                        statuses = workManager.getWorkInfosForUniqueWork(PPApplication.AFTER_FIRST_START_WORK_TAG);
+//                                        try {
+//                                            List<WorkInfo> workInfoList = statuses.get();
+//                                        } catch (Exception ignored) {
+//                                        }
+//                                        //}
+
+//                        PPApplicationStatic.logE("[WORKER_CALL] PhoneProfilesService.doFirstStart", "keepResultsForAtLeast");
+                        //workManager.enqueue(worker);
+                        // !!! MUST BE APPEND_OR_REPLACE FOR EXTRA_START_FOR_EXTERNAL_APPLICATION !!!
+                        workManager.enqueueUniqueWork(PPApplication.AFTER_SHIZUKU_START_WORK_TAG, ExistingWorkPolicy.REPLACE, worker);
+                    }
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                }
+
             }; //);
             PPApplicationStatic.createBasicExecutorPool();
             PPApplication.basicExecutorPool.submit(runnable);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/IconWidgetProvider.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/IconWidgetProvider.java
index d4ea3e8017..8eb727e2e0 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/IconWidgetProvider.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/IconWidgetProvider.java
@@ -53,6 +53,7 @@ public void onUpdate(Context context, AppWidgetManager _appWidgetManager, final
     private static void _onUpdate(Context context, AppWidgetManager appWidgetManager,
                           /*Profile _profile, DataWrapper _dataWrapper,*/ int[] appWidgetIds) {
 
+        String applicationWidgetIconLauncher;
         String applicationWidgetIconLightness;
         String applicationWidgetIconColor;
         boolean applicationWidgetIconCustomIconLightness;
@@ -79,6 +80,7 @@ private static void _onUpdate(Context context, AppWidgetManager appWidgetManager
 //        PPApplicationStatic.logE("[SYNCHRONIZED] IconWidgetProvider._onUpdate", "PPApplication.applicationPreferencesMutex");
         synchronized (PPApplication.applicationPreferencesMutex) {
 
+            applicationWidgetIconLauncher = ApplicationPreferences.applicationWidgetIconLauncher;
             applicationWidgetIconLightness = ApplicationPreferences.applicationWidgetIconLightness;
             applicationWidgetIconColor = ApplicationPreferences.applicationWidgetIconColor;
             applicationWidgetIconCustomIconLightness = ApplicationPreferences.applicationWidgetIconCustomIconLightness;
@@ -1160,7 +1162,12 @@ private static void _onUpdate(Context context, AppWidgetManager appWidgetManager
                 if (!applicationWidgetIconHideProfileName)
                     remoteViews.setTextViewText(R.id.icon_widget_name, profileName);
 
-                Intent intent = GlobalGUIRoutines.getIntentForStartupSource(context, PPApplication.STARTUP_SOURCE_WIDGET);
+                //Intent intent = GlobalGUIRoutines.getIntentForStartupSource(context, PPApplication.STARTUP_SOURCE_WIDGET);
+                Intent intent;
+                if (applicationWidgetIconLauncher.equals(StringConstants.EXTRA_ACTIVATOR))
+                    intent = new Intent(context.getApplicationContext(), ActivatorActivity.class);
+                else
+                    intent = new Intent(context.getApplicationContext(), EditorActivity.class);
                 // clear all opened activities
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_WIDGET);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoHelpFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoHelpFragment.java
index 8a272ec2e0..e5f06fa98e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoHelpFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoHelpFragment.java
@@ -119,7 +119,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
             infoText1.setVisibility(View.GONE);
         }
 
-        if ((!firstInstallation) && (ppppsVersion != 0) && (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_LATEST)) {
+        if ((!firstInstallation) && (ppppsVersion != 0) && (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_REQUIRED)) {
             news = true;
             TextView infoText1 = view.findViewById(R.id.activity_info_notification_pppps_new_version);
             infoText1.setVisibility(View.VISIBLE);
@@ -614,10 +614,10 @@ static void doOnViewCreated(@NonNull View view, Fragment fragment) {
         }
 
         if (view.findViewById(R.id.activity_info_notification_contact) != null) {
-            AboutApplicationActivity.emailMe(view.findViewById(R.id.activity_info_notification_contact),
+            GlobalUtils.emailMe(view.findViewById(R.id.activity_info_notification_contact),
                     fragment.getString(R.string.important_info_contact),
                     "", fragment.getString(R.string.about_application_support_subject),
-                    AboutApplicationActivity.getEmailBodyText(/*AboutApplicationActivity.EMAIL_BODY_SUPPORT, */activity),
+                    GlobalUtils.getEmailBodyText(/*AboutApplicationActivity.EMAIL_BODY_SUPPORT, */activity),
                     /*true,*/ activity);
         }
 
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoNotification.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoNotification.java
index 5c2a581785..5d6c930bef 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoNotification.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoNotification.java
@@ -60,7 +60,7 @@ static void showInfoNotification(Context context) {
                 showExtender = true;
 
             int ppppsVersion = ActivateProfileHelper.isPPPPutSettingsInstalled(context);
-            if ((ppppsVersion != 0) && (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_LATEST))
+            if ((ppppsVersion != 0) && (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_REQUIRED))
                 showPPPPS = true;
 
             //Log.e("ImportantInfoNotification.showInfoNotification", "showInfo="+showInfo);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoQuickGuideHelpFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoQuickGuideHelpFragment.java
index 792b4002ce..e79b7fb333 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoQuickGuideHelpFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ImportantInfoQuickGuideHelpFragment.java
@@ -62,10 +62,10 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         text = text + StringConstants.TAG_NUMBERED_LIST_END_LAST_ITEM_HTML;
         textView.setText(StringFormatUtils.fromHtml(text, false,  true, 1, 17, false));
 
-        AboutApplicationActivity.emailMe(view.findViewById(R.id.activity_info_notification_contact),
+        GlobalUtils.emailMe(view.findViewById(R.id.activity_info_notification_contact),
                 getString(R.string.important_info_contact),
                 "", getString(R.string.about_application_support_subject),
-                AboutApplicationActivity.getEmailBodyText(/*AboutApplicationActivity.EMAIL_BODY_SUPPORT, */activity),
+                GlobalUtils.getEmailBodyText(/*AboutApplicationActivity.EMAIL_BODY_SUPPORT, */activity),
                 /*true,*/ activity);
 
         TextView translationTextView = view.findViewById(R.id.activity_info_translations);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/InputStreamUtil.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/InputStreamUtil.java
deleted file mode 100644
index bccde49b6a..0000000000
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/InputStreamUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package sk.henrichg.phoneprofilesplus;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-
-@SuppressWarnings("unused")
-class InputStreamUtil {
-
-    public InputStreamUtil() {
-    }
-
-    /** @noinspection BlockingMethodInNonBlockingContext*/
-    static String read(InputStream is) {
-        try {
-            char[] buffer = new char[1024];
-            StringBuilder out = new StringBuilder();
-            InputStreamReader in = new InputStreamReader(is, StandardCharsets.UTF_8);
-
-            int read;
-            do {
-                read = in.read(buffer, 0, buffer.length);
-                if (read > 0) {
-                    out.append(buffer, 0, read);
-                }
-            } while(read >= 0);
-
-            return out.toString();
-        } catch (IOException var5) {
-            throw new RuntimeException(var5);
-        }
-    }
-
-    /** @noinspection BlockingMethodInNonBlockingContext*/
-    static void copy(InputStream is, OutputStream out) {
-        try {
-            byte[] buffer = new byte[1024];
-
-            int read;
-            do {
-                read = is.read(buffer, 0, buffer.length);
-                if (read > 0) {
-                    out.write(buffer, 0, read);
-                }
-            } while(read >= 0);
-
-        } catch (IOException var4) {
-            throw new RuntimeException(var4);
-        }
-    }
-}
\ No newline at end of file
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/LocaleHelper.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/LocaleHelper.java
index 8098d4e34e..4a96e4ac45 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/LocaleHelper.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/LocaleHelper.java
@@ -23,6 +23,9 @@ public class LocaleHelper {
     private static final String LANG_LATN = "Latn";
     private static final String LANG_SR = "sr";
 
+    private LocaleHelper() {
+        // private constructor to prevent instantiation
+    }
 
     public static Context onAttach(Context context) {
         String language;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MainWorker.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MainWorker.java
index d250f631d5..be5c0ba35a 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MainWorker.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MainWorker.java
@@ -231,6 +231,7 @@ public Result doWork() {
                         }
                         break;
                     case PPApplication.AFTER_FIRST_START_WORK_TAG:
+                    case PPApplication.AFTER_SHIZUKU_START_WORK_TAG:
                         if (!PPApplicationStatic.getApplicationStarted(true, false))
                             // application is not started
                             return Result.success();
@@ -240,7 +241,10 @@ public Result doWork() {
                                 getInputData().getBoolean(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APPLICATION, false),
                                 getInputData().getString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_ACTION),
                                 getInputData().getInt(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_TYPE, 0),
-                                getInputData().getString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_VALUE));
+                                getInputData().getString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_VALUE),
+                                getInputData().getBoolean(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START,
+                                        tag.equals(PPApplication.AFTER_SHIZUKU_START_WORK_TAG))
+                                );
                                 //getInputData().getBoolean(PhoneProfilesService.EXTRA_SHOW_TOAST, true));
                         break;
                     case SCHEDULE_AVOID_RESCHEDULE_RECEIVER_WORK_TAG:
@@ -342,7 +346,8 @@ private void doAfterFirstStart(Context context,
                                           boolean startForExternalApplication,
                                           String startForExternalAppAction,
                                           int startForExternalAppDataType,
-                                          String startForExternalAppDataValue) {
+                                          String startForExternalAppDataValue,
+                                          boolean startForShizukuStart) {
         PPApplicationStatic.logE("------- MainWorker.doAfterFirstStart", "START");
 
         final Context appContext = context.getApplicationContext();
@@ -397,7 +402,7 @@ private void doAfterFirstStart(Context context,
             PhoneProfilesServiceStatic.registerPPPExtenderReceiver(true, dataWrapper, appContext);
             PhoneProfilesServiceStatic.registerEventsReceiversAndWorkers(false, appContext);
 
-            if (PPApplication.deviceBoot) {
+            if ((!startForShizukuStart) && PPApplication.deviceBoot) {
                 PPApplication.deviceBoot = false;
                 PPApplicationStatic.logE("MainWorker.doAfterFirstStart", "device boot");
                 boolean deviceBootEvents = dataWrapper.eventTypeExists(DatabaseHandler.ETYPE_DEVICE_BOOT);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCell.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCell.java
index b144a620b7..ba693f6f0e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCell.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCell.java
@@ -3,6 +3,7 @@
 class MobileCell {
     long _id;
     int _cellId;
+    long _cellIdLong;
     String _name;
     boolean _new;
     long _lastConnectedTime;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellNamesPreferenceFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellNamesPreferenceFragment.java
index 217d558089..d3d8dd7757 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellNamesPreferenceFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellNamesPreferenceFragment.java
@@ -234,7 +234,7 @@ void setLocationEnableStatus() {
                                 Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
                                 //intent.addCategory(Intent.CATEGORY_DEFAULT);
                                 //noinspection deprecation
-                                getActivity().startActivityForResult(intent, PhoneProfilesPrefsFragment.RESULT_WIFI_BLUETOOTH_MOBILE_CELLS_LOCATION_SETTINGS);
+                                getActivity().startActivityForResult(intent, EventsPrefsFragment.RESULT_MOBILE_CELLS_LOCATION_SYSTEM_SETTINGS);
                                 ok = true;
                             } catch (Exception e) {
                                 PPApplicationStatic.recordException(e);
@@ -304,10 +304,13 @@ private static class RefreshListViewAsyncTask extends AsyncTask<Void, Integer, V
         boolean sim1Exists;
         boolean sim2Exists;
         int registeredCellDefault;
+        long registeredCellLongDefault;
         String registeredCellNameDefault;
         int registeredCellSIM1;
+        long registeredCellLongSIM1;
         String registeredCellNameSIM1;
         int registeredCellSIM2;
+        long registeredCellLongSIM2;
         String registeredCellNameSIM2;
 
         public RefreshListViewAsyncTask(/*final boolean forRescan,*/
@@ -376,19 +379,21 @@ protected Void doInBackground(Void... params) {
 
                         if ((fragment.phoneCount > 1)) {
                             if (sim1Exists) {
-                                if (PPApplication.mobileCellsScanner != null) {
+                                //if (PPApplication.mobileCellsScanner != null) {
                                     registeredCellSIM1 = PPApplication.mobileCellsScanner.getRegisteredCell(1);
+                                    registeredCellLongSIM1 = PPApplication.mobileCellsScanner.getRegisteredCellLong(1);
                                     List<MobileCellsData> _cellsList = new ArrayList<>();
-                                    db.addMobileCellsToList(_cellsList, registeredCellSIM1);
+                                    db.addMobileCellsToList(_cellsList, registeredCellSIM1, registeredCellLongSIM1);
                                     if (!_cellsList.isEmpty())
                                         registeredCellNameSIM1 = _cellsList.get(0).name;
-                                }
+                                //}
                             }
                             if (sim2Exists) {
                                 if (PPApplication.mobileCellsScanner != null) {
                                     registeredCellSIM2 = PPApplication.mobileCellsScanner.getRegisteredCell(2);
+                                    registeredCellLongSIM2 = PPApplication.mobileCellsScanner.getRegisteredCellLong(2);
                                     List<MobileCellsData> _cellsList = new ArrayList<>();
-                                    db.addMobileCellsToList(_cellsList, registeredCellSIM2);
+                                    db.addMobileCellsToList(_cellsList, registeredCellSIM2, registeredCellLongSIM2);
                                     if (!_cellsList.isEmpty())
                                         registeredCellNameSIM2 = _cellsList.get(0).name;
                                 }
@@ -396,8 +401,9 @@ protected Void doInBackground(Void... params) {
                         } else {
                             if (PPApplication.mobileCellsScanner != null) {
                                 registeredCellDefault = PPApplication.mobileCellsScanner.getRegisteredCell(0);
+                                registeredCellLongDefault = PPApplication.mobileCellsScanner.getRegisteredCellLong(0);
                                 List<MobileCellsData> _cellsList = new ArrayList<>();
-                                db.addMobileCellsToList(_cellsList, registeredCellDefault);
+                                db.addMobileCellsToList(_cellsList, registeredCellDefault, registeredCellLongDefault);
                                 if (!_cellsList.isEmpty())
                                     registeredCellNameDefault = _cellsList.get(0).name;
                             }
@@ -442,7 +448,7 @@ protected void onPostExecute(Void result) {
                         if ((fragment.phoneCount > 1)) {
                             if (sim1Exists) {
                                 String connectedCellName = prefContext.getString(R.string.mobile_cells_pref_dlg_connected_cell_sim1) + " ";
-                                if (MobileCellsScanner.isValidCellId(registeredCellSIM1)) {
+                                if (MobileCellsScanner.isValidCellId(registeredCellSIM1, registeredCellLongSIM1)) {
                                     if ((registeredCellNameSIM1 != null) && (!registeredCellNameSIM1.isEmpty()))
                                         connectedCellName = connectedCellName + registeredCellNameSIM1 + ", ";
                                     connectedCellName = connectedCellName + registeredCellSIM1;
@@ -451,7 +457,7 @@ protected void onPostExecute(Void result) {
                             }
                             if (sim2Exists) {
                                 String connectedCellName = prefContext.getString(R.string.mobile_cells_pref_dlg_connected_cell_sim2) + " ";
-                                if (MobileCellsScanner.isValidCellId(registeredCellSIM2)) {
+                                if (MobileCellsScanner.isValidCellId(registeredCellSIM2, registeredCellLongSIM2)) {
                                     if ((registeredCellNameSIM2 != null) && (!registeredCellNameSIM2.isEmpty()))
                                         connectedCellName = connectedCellName + registeredCellNameSIM2 + ", ";
                                     connectedCellName = connectedCellName + registeredCellSIM2;
@@ -460,7 +466,7 @@ protected void onPostExecute(Void result) {
                             }
                         } else {
                             String connectedCellName = prefContext.getString(R.string.mobile_cells_pref_dlg_connected_cell) + " ";
-                            if (MobileCellsScanner.isValidCellId(registeredCellDefault)) {
+                            if (MobileCellsScanner.isValidCellId(registeredCellDefault, registeredCellLongDefault)) {
                                 if ((registeredCellNameDefault != null) && (!registeredCellNameDefault.isEmpty()))
                                     connectedCellName = connectedCellName + registeredCellNameDefault + ", ";
                                 connectedCellName = connectedCellName + registeredCellDefault;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsData.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsData.java
index 45c2218cf6..a2c03df51b 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsData.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsData.java
@@ -3,6 +3,7 @@
 class MobileCellsData {
 
     int cellId;
+    long cellIdLong;
     String name;
     boolean connected;
     boolean _new;
@@ -16,9 +17,10 @@ class MobileCellsData {
     MobileCellsData() {
     }
 
-    MobileCellsData(int cellId, String name, boolean connected, boolean _new, long lastConnectedTime/*,
+    MobileCellsData(int cellId, long celIdLong, String name, boolean connected, boolean _new, long lastConnectedTime/*,
                     String lastRunningEvents, String lastPausedEvents, boolean doNotDetect*/) {
         this.cellId = cellId;
+        this.cellIdLong = celIdLong;
         this.name = name;
         this.connected = connected;
         this._new = _new;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreference.java
index bd6726c573..022bc811bb 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreference.java
@@ -84,51 +84,80 @@ private void setSummary() {
     }
     */
 
-    void addCellId(int cellId) {
+    void addCellId(int cellId, long cellIdLong) {
         String[] splits = value.split(StringConstants.STR_SPLIT_REGEX);
         String sCellId = Integer.toString(cellId);
+        String sCellIdLong = Long.toString(cellIdLong);
         boolean found = false;
         for (String cell : splits) {
             if (!cell.isEmpty()) {
-                if (cell.equals(sCellId)) {
-                    found = true;
-                    break;
+                if (cellId != Integer.MAX_VALUE) {
+                    if (cell.equals(sCellId)) {
+                        found = true;
+                        break;
+                    }
+                } else if (cellIdLong != Long.MAX_VALUE) {
+                    if (cell.equals(sCellIdLong)) {
+                        found = true;
+                        break;
+                    }
                 }
             }
         }
         if (!found) {
             if (!value.isEmpty())
                 value = value + "|";
-            value = value + sCellId;
+            if (cellId != Integer.MAX_VALUE)
+                value = value + sCellId;
+            else if (cellIdLong != Long.MAX_VALUE)
+                value = value + sCellIdLong;
         }
     }
 
-    void removeCellId(int cellId) {
+    void removeCellId(int cellId, long cellIdLong) {
         String[] splits = value.split(StringConstants.STR_SPLIT_REGEX);
         String sCellId = Integer.toString(cellId);
+        String sCellIdLOng = Long.toString(cellIdLong);
         value = "";
         StringBuilder _value = new StringBuilder();
         for (String cell : splits) {
             if (!cell.isEmpty()) {
-                if (!cell.equals(sCellId)) {
-                    //if (!value.isEmpty())
-                    //    value = value + "|";
-                    //value = value + cell;
-                    if (_value.length() > 0)
-                        _value.append("|");
-                    _value.append(cell);
+                if (cellId != Integer.MAX_VALUE) {
+                    if (!cell.equals(sCellId)) {
+                        //if (!value.isEmpty())
+                        //    value = value + "|";
+                        //value = value + cell;
+                        if (_value.length() > 0)
+                            _value.append("|");
+                        _value.append(cell);
+                    }
+                } else if (cellIdLong != Long.MAX_VALUE) {
+                    if (!cell.equals(sCellIdLOng)) {
+                        //if (!value.isEmpty())
+                        //    value = value + "|";
+                        //value = value + cell;
+                        if (_value.length() > 0)
+                            _value.append("|");
+                        _value.append(cell);
+                    }
                 }
             }
         }
         value = _value.toString();
     }
 
-    boolean isCellSelected(int cellId) {
+    boolean isCellSelected(int cellId, long cellIdLong) {
         String[] splits = value.split(StringConstants.STR_SPLIT_REGEX);
         String sCellId = Integer.toString(cellId);
+        String sCellIdLong = Long.toString(cellIdLong);
         for (String cell : splits) {
-            if (cell.equals(sCellId))
-                return true;
+            if (cellId != Integer.MAX_VALUE) {
+                if (cell.equals(sCellId))
+                    return true;
+            } else if (cellIdLong != Long.MAX_VALUE) {
+                if (cell.equals(sCellIdLong))
+                    return true;
+            }
         }
         return false;
     }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceAdapter.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceAdapter.java
index 0539f9cfb7..d797555d2d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceAdapter.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceAdapter.java
@@ -77,8 +77,8 @@ public View getView(final int position, View convertView, ViewGroup parent)
             return vi;
 
         MobileCellsData cellData = preference.filteredCellsList.get(position);
-        //System.out.println(String.valueOf(position));
 
+        //noinspection ExtractMethodRecommender
         String cellName = "";
         if (!cellData.name.isEmpty())
             cellName = cellData.name + StringConstants.CHAR_NEW_LINE;
@@ -89,7 +89,10 @@ public View getView(final int position, View convertView, ViewGroup parent)
             cellFlags = cellFlags + "C";
         if (!cellFlags.isEmpty())
             cellName = cellName + "(" + cellFlags + ") ";
-        cellName = cellName + cellData.cellId;
+        if (cellData.cellId != Integer.MAX_VALUE)
+            cellName = cellName + cellData.cellId;
+        else
+            cellName = cellName + cellData.cellIdLong;
         holder.cellId.setText(cellName);
 
         if (cellData.lastConnectedTime != 0) {
@@ -102,18 +105,23 @@ public View getView(final int position, View convertView, ViewGroup parent)
         }
 
         holder.checkBox.setTag(position);
-        holder.checkBox.setChecked(preference.isCellSelected(cellData.cellId));
+        //if (cellData.cellId != Integer.MAX_VALUE)
+        //    holder.checkBox.setChecked(preference.isCellSelected(cellData.cellId, Long.MAX_VALUE));
+        //else if (cellData.cellIdLong != Long.MAX_VALUE)
+        // holder.checkBox.setChecked(preference.isCellSelected(Integer.MAX_VALUE, cellData.cellIdLong));
+        holder.checkBox.setChecked(preference.isCellSelected(cellData.cellId, cellData.cellIdLong));
         holder.checkBox.setOnClickListener(v -> {
             CheckBox chb = (CheckBox) v;
 
             int cellPosition = (Integer)chb.getTag();
             if (cellPosition < preference.filteredCellsList.size()) {
                 int cellId = preference.filteredCellsList.get(cellPosition).cellId;
+                long cellIdLong = preference.filteredCellsList.get(cellPosition).cellIdLong;
 
                 if (chb.isChecked())
-                    preference.addCellId(cellId);
+                    preference.addCellId(cellId, cellIdLong);
                 else
-                    preference.removeCellId(cellId);
+                    preference.removeCellId(cellId, cellIdLong);
                 preference.refreshListView(false, false/*, Integer.MAX_VALUE*/);
             }
         });
@@ -133,7 +141,8 @@ public View getView(final int position, View convertView, ViewGroup parent)
         //else
         //    holder.itemEditMenu.setVisibility(View.VISIBLE);
         TooltipCompat.setTooltipText(holder.itemEditMenu, context.getString(R.string.tooltip_options_menu));
-        holder.itemEditMenu.setTag(preference.filteredCellsList.get(position).cellId);
+        holder.itemEditMenu.setTag(R.id.editMenuTagCell, preference.filteredCellsList.get(position).cellId);
+        holder.itemEditMenu.setTag(R.id.editMenuTagCellLong, preference.filteredCellsList.get(position).cellIdLong);
         final ImageView itemEditMenu = holder.itemEditMenu;
         holder.itemEditMenu.setOnClickListener(v -> preference.showEditMenu(itemEditMenu));
 
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceFragment.java
index d2b430a094..3b73f10f2d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsEditorPreferenceFragment.java
@@ -219,13 +219,17 @@ public void afterTextChanged(Editable s) {
 
         cellsListView.setOnItemClickListener((parent, item, position, id) -> {
             int cellId = preference.filteredCellsList.get(position).cellId;
+            long cellIdLong = preference.filteredCellsList.get(position).cellIdLong;
             MobileCellsEditorViewHolder viewHolder =
                     (MobileCellsEditorViewHolder) item.getTag();
-            viewHolder.checkBox.setChecked(!preference.isCellSelected(cellId));
+            if (cellId != Integer.MAX_VALUE)
+                viewHolder.checkBox.setChecked(!preference.isCellSelected(cellId, Long.MAX_VALUE));
+            else
+                viewHolder.checkBox.setChecked(!preference.isCellSelected(Integer.MAX_VALUE, cellIdLong));
             if (viewHolder.checkBox.isChecked())
-                preference.addCellId(cellId);
+                preference.addCellId(cellId, cellIdLong);
             else
-                preference.removeCellId(cellId);
+                preference.removeCellId(cellId, cellIdLong);
             preference.refreshListView(false, false/*, Integer.MAX_VALUE*/);
         });
 
@@ -327,7 +331,7 @@ public void afterTextChanged(Editable s) {
                                                     if (cellName != null) {
                                                         for (MobileCellsData cell : preference.filteredCellsList) {
                                                             if (cell.name.equals(cellName.getText().toString()))
-                                                                preference.addCellId(cell.cellId);
+                                                                preference.addCellId(cell.cellId, cell.cellIdLong);
                                                         }
                                                         refreshListView(false, false/*, Integer.MAX_VALUE*/);
                                                     }
@@ -337,7 +341,7 @@ public void afterTextChanged(Editable s) {
                                     case 2:
                                         preference.value = "";
                                         for (MobileCellsData cell : preference.filteredCellsList) {
-                                            preference.addCellId(cell.cellId);
+                                            preference.addCellId(cell.cellId, cell.cellIdLong);
                                         }
                                         refreshListView(false, false/*, Integer.MAX_VALUE*/);
                                         break;
@@ -442,7 +446,8 @@ public void afterTextChanged(Editable s) {
                                     List<MobileCellsData> _cellsList = new ArrayList<>();
                                     _cellsList.add(preference.registeredCellDataSIM1);
                                     db.saveMobileCellsList(_cellsList, true, false);
-                                    preference.addCellId(preference.registeredCellDataSIM1.cellId);
+                                    preference.addCellId(preference.registeredCellDataSIM1.cellId,
+                                            preference.registeredCellDataSIM1.cellIdLong);
                                     refreshListView(false, false/*, preference.registeredCellDataSIM1.cellId*/);
                                 }
                             });
@@ -463,7 +468,8 @@ public void afterTextChanged(Editable s) {
                                     List<MobileCellsData> _cellsList = new ArrayList<>();
                                     _cellsList.add(preference.registeredCellDataSIM2);
                                     db.saveMobileCellsList(_cellsList, true, false);
-                                    preference.addCellId(preference.registeredCellDataSIM2.cellId);
+                                    preference.addCellId(preference.registeredCellDataSIM2.cellId,
+                                            preference.registeredCellDataSIM2.cellIdLong);
                                     refreshListView(false, false/*, preference.registeredCellDataSIM2.cellId*/);
                                 }
                             });
@@ -485,7 +491,8 @@ public void afterTextChanged(Editable s) {
                                     List<MobileCellsData> _cellsList = new ArrayList<>();
                                     _cellsList.add(preference.registeredCellDataDefault);
                                     db.saveMobileCellsList(_cellsList, true, false);
-                                    preference.addCellId(preference.registeredCellDataDefault.cellId);
+                                    preference.addCellId(preference.registeredCellDataDefault.cellId,
+                                            preference.registeredCellDataDefault.cellIdLong);
                                     refreshListView(false, false/*, preference.registeredCellDataDefault.cellId*/);
                                 }
                             });
@@ -640,7 +647,10 @@ public int compare(MobileCellsData lhs, MobileCellsData rhs) {
                     _lhs = _lhs + "0002";
                 else
                     _lhs = _lhs + "0003" + lhs.name;
-                _lhs = _lhs + "-" + lhs.cellId;
+                if (lhs.cellId != Integer.MAX_VALUE)
+                    _lhs = _lhs + "-" + lhs.cellId;
+                else
+                    _lhs = _lhs + "-" + lhs.cellIdLong;
 
                 String _rhs = "";
                 if (rhs._new)
@@ -651,7 +661,10 @@ public int compare(MobileCellsData lhs, MobileCellsData rhs) {
                     _rhs = _rhs + "0002";
                 else
                     _rhs = _rhs + "0003" + rhs.name;
-                _rhs = _rhs + "-" + rhs.cellId;
+                if (rhs.cellId != Integer.MAX_VALUE)
+                    _rhs = _rhs + "-" + rhs.cellId;
+                else
+                    _rhs = _rhs + "-" + rhs.cellIdLong;
                 return PPApplication.collator.compare(_lhs, _rhs);
             }
             else
@@ -701,7 +714,8 @@ void showEditMenu(View view) {
         popup = new PopupMenu(_context, view, Gravity.END);
         new MenuInflater(_context).inflate(R.menu.mobile_cells_pref_item_edit, popup.getMenu());
 
-        final int cellId = (int)view.getTag();
+        final int cellId = (int)view.getTag(R.id.editMenuTagCell);
+        final long cellIdLong = (long)view.getTag(R.id.editMenuTagCellLong);
 
         popup.setOnMenuItemClickListener(item -> {
             int itemId = item.getItemId();
@@ -716,11 +730,16 @@ void showEditMenu(View view) {
                             null, null,
                             (dialog1, which) -> {
                                 DatabaseHandler db = DatabaseHandler.getInstance(_context);
-                                db.deleteMobileCell(cellId);
-                                preference.removeCellId(cellId);
+                                db.deleteMobileCell(cellId, cellIdLong);
+                                preference.removeCellId(cellId, cellIdLong);
                                 refreshListView(false, false/*, Integer.MAX_VALUE*/);
                                 for (MobileCellsData cell : preference.filteredCellsList) {
-                                    if ((cell.cellId == cellId) && (cell.name != null) && (!cell.name.isEmpty())){
+                                    boolean cellIdEquals = false;
+                                    if (cellId != Integer.MAX_VALUE)
+                                        cellIdEquals = cell.cellId == cellId;
+                                    else if (cellIdLong != Long.MAX_VALUE)
+                                        cellIdEquals = cell.cellIdLong == cellIdLong;
+                                    if (cellIdEquals && (cell.name != null) && (!cell.name.isEmpty())){
                                         deleteCellNamesFromEventsAsyncTask = new DeleteCellNamesFromEventsAsyncTask(cell.name, prefContext);
                                         deleteCellNamesFromEventsAsyncTask.execute();
                                         break;
@@ -759,9 +778,15 @@ void showEditMenu(View view) {
                                 DatabaseHandler db = DatabaseHandler.getInstance(_context);
                                 for (MobileCellsData cell : preference.filteredCellsList) {
                                     for (String valueCell : splits) {
-                                        if (valueCell.equals(Integer.toString(cell.cellId))) {
-                                            db.deleteMobileCell(cell.cellId);
-                                            preference.removeCellId(cell.cellId);
+                                        boolean cellIdEquals = false;
+                                        long vCellId = Long.parseLong(valueCell);
+                                        if (vCellId <= Integer.MAX_VALUE)
+                                            cellIdEquals = (vCellId != Integer.MAX_VALUE) && (vCellId == cell.cellId);
+                                        else if (vCellId != Long.MAX_VALUE)
+                                            cellIdEquals = vCellId == cell.cellIdLong;
+                                        if (cellIdEquals) {
+                                            db.deleteMobileCell(cell.cellId, cell.cellIdLong);
+                                            preference.removeCellId(cell.cellId, cell.cellIdLong);
                                             if ((cell.name != null) && (!cell.name.isEmpty())) {
                                                 if (deletedCellNames.length() > 0)
                                                     deletedCellNames.append("|");
@@ -805,14 +830,20 @@ void showEditMenu(View view) {
                                 for (MobileCellsData cell : preference.filteredCellsList) {
                                     boolean isSelected = false;
                                     for (String valueCell : splits) {
-                                        if (valueCell.equals(Integer.toString(cell.cellId))) {
+                                        boolean cellIdEquals = false;
+                                        long vCellId = Long.parseLong(valueCell);
+                                        if (vCellId <= Integer.MAX_VALUE)
+                                            cellIdEquals = (vCellId != Integer.MAX_VALUE) && (vCellId == cell.cellId);
+                                        else if (vCellId != Long.MAX_VALUE)
+                                            cellIdEquals = vCellId == cell.cellIdLong;
+                                        if (cellIdEquals) {
                                             isSelected = true;
                                             break;
                                         }
                                     }
                                     if (!isSelected) {
-                                        db.deleteMobileCell(cell.cellId);
-                                        preference.removeCellId(cell.cellId);
+                                        db.deleteMobileCell(cell.cellId, cell.cellIdLong);
+                                        preference.removeCellId(cell.cellId, cell.cellIdLong);
                                         if ((cell.name != null) && (!cell.name.isEmpty())) {
                                             if (deletedCellNames.length() > 0)
                                                 deletedCellNames.append("|");
@@ -977,7 +1008,9 @@ protected Void doInBackground(Void... params) {
                     if ((fragment.phoneCount > 1)) {
                         if (sim1Exists) {
                             if (fragment.preference.registeredCellDataSIM1 != null) {
-                                _registeredCellDataSIM1 = new MobileCellsData(fragment.preference.registeredCellDataSIM1.cellId,
+                                _registeredCellDataSIM1 = new MobileCellsData(
+                                        fragment.preference.registeredCellDataSIM1.cellId,
+                                        fragment.preference.registeredCellDataSIM1.cellIdLong,
                                         fragment.preference.registeredCellDataSIM1.name,
                                         fragment.preference.registeredCellDataSIM1.connected,
                                         fragment.preference.registeredCellDataSIM1._new,
@@ -993,7 +1026,9 @@ protected Void doInBackground(Void... params) {
 
                         if (sim2Exists) {
                             if (fragment.preference.registeredCellDataSIM2 != null) {
-                                _registeredCellDataSIM2 = new MobileCellsData(fragment.preference.registeredCellDataSIM2.cellId,
+                                _registeredCellDataSIM2 = new MobileCellsData(
+                                        fragment.preference.registeredCellDataSIM2.cellId,
+                                        fragment.preference.registeredCellDataSIM2.cellIdLong,
                                         fragment.preference.registeredCellDataSIM2.name,
                                         fragment.preference.registeredCellDataSIM2.connected,
                                         fragment.preference.registeredCellDataSIM2._new,
@@ -1008,7 +1043,9 @@ protected Void doInBackground(Void... params) {
                         }
                     } else {
                         if (fragment.preference.registeredCellDataDefault != null) {
-                            _registeredCellDataDefault = new MobileCellsData(fragment.preference.registeredCellDataDefault.cellId,
+                            _registeredCellDataDefault = new MobileCellsData(
+                                    fragment.preference.registeredCellDataDefault.cellId,
+                                    fragment.preference.registeredCellDataDefault.cellIdLong,
                                     fragment.preference.registeredCellDataDefault.name,
                                     fragment.preference.registeredCellDataDefault.connected,
                                     fragment.preference.registeredCellDataDefault._new,
@@ -1032,7 +1069,7 @@ protected Void doInBackground(Void... params) {
 
                     // add all from table
                     DatabaseHandler db = DatabaseHandler.getInstance(prefContext.getApplicationContext());
-                    db.addMobileCellsToList(_cellsList, 0);
+                    db.addMobileCellsToList(_cellsList, 0, 0);
 
                     _registeredCellDataSIM1 = null;
                     _registeredCellInTableSIM1 = false;
@@ -1051,21 +1088,34 @@ protected Void doInBackground(Void... params) {
 
                         if ((fragment.phoneCount > 1)) {
                             if (sim1Exists) {
-                                if (PPApplication.mobileCellsScanner != null) {
+                                //if (PPApplication.mobileCellsScanner != null) {
                                     int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(1);
+                                    long registeredCellLong = PPApplication.mobileCellsScanner.getRegisteredCellLong(1);
                                     long lastConnectedTime = PPApplication.mobileCellsScanner.getLastConnectedTime(1);
                                     for (MobileCellsData cell : _cellsList) {
-                                        if (cell.cellId == registeredCell) {
-                                            cell.connected = true;
-                                            _registeredCellDataSIM1 = cell;
-                                            _registeredCellInTableSIM1 = true;
-                                            break;
+                                        if (registeredCell != Integer.MAX_VALUE) {
+                                            if (cell.cellId == registeredCell) {
+                                                cell.connected = true;
+                                                _registeredCellDataSIM1 = cell;
+                                                _registeredCellInTableSIM1 = true;
+                                                break;
+                                            }
+                                        } else if (registeredCellLong != Long.MAX_VALUE) {
+                                            if (cell.cellIdLong == registeredCellLong) {
+                                                cell.connected = true;
+                                                _registeredCellDataSIM1 = cell;
+                                                _registeredCellInTableSIM1 = true;
+                                                break;
+                                            }
                                         }
                                     }
-                                    if (!_registeredCellInTableSIM1 && MobileCellsScanner.isValidCellId(registeredCell) /*&&
+                                    if (!_registeredCellInTableSIM1 &&
+                                            MobileCellsScanner.isValidCellId(registeredCell, registeredCellLong) /*&&
                                             (!_cellName.isEmpty())*/) {
                                         //synchronized (PPApplication.mobileCellsScannerMutex) {
-                                        _registeredCellDataSIM1 = new MobileCellsData(registeredCell,
+                                        _registeredCellDataSIM1 = new MobileCellsData(
+                                                registeredCell,
+                                                registeredCellLong,
                                                 ""/*_cellName*/, true, true,
                                                 lastConnectedTime//,
                                                 //MobileCellsScanner.lastRunningEventsNotOutside,
@@ -1075,24 +1125,36 @@ protected Void doInBackground(Void... params) {
                                         //_cellsList.add(_registeredCellDataSIM1);
                                         //}
                                     }
-                                }
+                                //}
                             }
                             if (sim2Exists) {
                                 if (PPApplication.mobileCellsScanner != null) {
                                     int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(2);
+                                    long registeredCellLong = PPApplication.mobileCellsScanner.getRegisteredCellLong(2);
                                     long lastConnectedTime = PPApplication.mobileCellsScanner.getLastConnectedTime(2);
                                     for (MobileCellsData cell : _cellsList) {
-                                        if (cell.cellId == registeredCell) {
-                                            cell.connected = true;
-                                            _registeredCellDataSIM2 = cell;
-                                            _registeredCellInTableSIM2 = true;
-                                            break;
+                                        if (registeredCell != Integer.MAX_VALUE) {
+                                            if (cell.cellId == registeredCell) {
+                                                cell.connected = true;
+                                                _registeredCellDataSIM2 = cell;
+                                                _registeredCellInTableSIM2 = true;
+                                                break;
+                                            }
+                                        } else  if (registeredCellLong != Long.MAX_VALUE) {
+                                            if (cell.cellIdLong == registeredCellLong) {
+                                                cell.connected = true;
+                                                _registeredCellDataSIM2 = cell;
+                                                _registeredCellInTableSIM2 = true;
+                                                break;
+                                            }
                                         }
                                     }
-                                    if (!_registeredCellInTableSIM2 && MobileCellsScanner.isValidCellId(registeredCell) /*&&
+                                    if (!_registeredCellInTableSIM2 && MobileCellsScanner.isValidCellId(registeredCell, registeredCellLong) /*&&
                                             (!_cellName.isEmpty())*/) {
                                         //synchronized (PPApplication.mobileCellsScannerMutex) {
-                                        _registeredCellDataSIM2 = new MobileCellsData(registeredCell,
+                                        _registeredCellDataSIM2 = new MobileCellsData(
+                                                registeredCell,
+                                                registeredCellLong,
                                                 ""/*_cellName*/, true, true,
                                                 lastConnectedTime//,
                                                 //MobileCellsScanner.lastRunningEventsNotOutside,
@@ -1107,19 +1169,31 @@ protected Void doInBackground(Void... params) {
                         } else {
                             if (PPApplication.mobileCellsScanner != null) {
                                 int registeredCell = PPApplication.mobileCellsScanner.getRegisteredCell(0);
+                                long registeredCellLong = PPApplication.mobileCellsScanner.getRegisteredCellLong(0);
                                 long lastConnectedTime = PPApplication.mobileCellsScanner.getLastConnectedTime(0);
                                 for (MobileCellsData cell : _cellsList) {
-                                    if (cell.cellId == registeredCell) {
-                                        cell.connected = true;
-                                        _registeredCellDataDefault = cell;
-                                        _registeredCellInTableDefault = true;
-                                        break;
+                                    if (registeredCell != Integer.MAX_VALUE) {
+                                        if (cell.cellId == registeredCell) {
+                                            cell.connected = true;
+                                            _registeredCellDataDefault = cell;
+                                            _registeredCellInTableDefault = true;
+                                            break;
+                                        }
+                                    } else  if (registeredCellLong != Long.MAX_VALUE) {
+                                        if (cell.cellIdLong == registeredCellLong) {
+                                            cell.connected = true;
+                                            _registeredCellDataDefault = cell;
+                                            _registeredCellInTableDefault = true;
+                                            break;
+                                        }
                                     }
                                 }
-                                if (!_registeredCellInTableDefault && MobileCellsScanner.isValidCellId(registeredCell) /*&&
+                                if (!_registeredCellInTableDefault && MobileCellsScanner.isValidCellId(registeredCell, registeredCellLong) /*&&
                                         (!_cellName.isEmpty())*/) {
                                     //synchronized (PPApplication.mobileCellsScannerMutex) {
-                                    _registeredCellDataDefault = new MobileCellsData(registeredCell,
+                                    _registeredCellDataDefault = new MobileCellsData(
+                                            registeredCell,
+                                            registeredCellLong,
                                             ""/*_cellName*/, true, true,
                                             lastConnectedTime//,
                                             //MobileCellsScanner.lastRunningEventsNotOutside,
@@ -1202,7 +1276,14 @@ protected Void doInBackground(Void... params) {
                             // add only cell in _value = selected for edited event
                             String[] splits = _value.split(StringConstants.STR_SPLIT_REGEX);
                             for (String cell : splits) {
-                                if (cell.equals(Integer.toString(cellData.cellId))) {
+                                boolean cellIdEquals = false;
+                                long vCellId = Long.parseLong(cell);
+                                if (vCellId <= Integer.MAX_VALUE)
+                                    cellIdEquals = (vCellId != Integer.MAX_VALUE) && (vCellId == cellData.cellId);
+                                else if (vCellId != Long.MAX_VALUE)
+                                    cellIdEquals = vCellId == cellData.cellIdLong;
+
+                                if (cellIdEquals) {
                                     _filteredCellsList.add(cellData);
                                     break;
                                 }
@@ -1273,6 +1354,7 @@ protected void onPostExecute(Void result) {
                         if (_registeredCellDataSIM1 != null) {
                             preference.registeredCellDataSIM1 = new MobileCellsData(
                                     _registeredCellDataSIM1.cellId,
+                                    _registeredCellDataSIM1.cellIdLong,
                                     _registeredCellDataSIM1.name,
                                     _registeredCellDataSIM1.connected,
                                     _registeredCellDataSIM1._new,
@@ -1289,6 +1371,7 @@ protected void onPostExecute(Void result) {
                         if (_registeredCellDataSIM2 != null) {
                             preference.registeredCellDataSIM2 = new MobileCellsData(
                                     _registeredCellDataSIM2.cellId,
+                                    _registeredCellDataSIM2.cellIdLong,
                                     _registeredCellDataSIM2.name,
                                     _registeredCellDataSIM2.connected,
                                     _registeredCellDataSIM2._new,
@@ -1305,6 +1388,7 @@ protected void onPostExecute(Void result) {
                     if (_registeredCellDataDefault != null) {
                         preference.registeredCellDataDefault = new MobileCellsData(
                                 _registeredCellDataDefault.cellId,
+                                _registeredCellDataDefault.cellIdLong,
                                 _registeredCellDataDefault.name,
                                 _registeredCellDataDefault.connected,
                                 _registeredCellDataDefault._new,
@@ -1333,7 +1417,10 @@ protected void onPostExecute(Void result) {
                             //    cellFlags = cellFlags + "C";
                             if (!cellFlags.isEmpty())
                                 connectedCellName = connectedCellName + "(" + cellFlags + ") ";
-                            connectedCellName = connectedCellName + preference.registeredCellDataSIM1.cellId;
+                            if (preference.registeredCellDataSIM1.cellId != Integer.MAX_VALUE)
+                                connectedCellName = connectedCellName + preference.registeredCellDataSIM1.cellId;
+                            else if (preference.registeredCellDataSIM1.cellIdLong != Long.MAX_VALUE)
+                                connectedCellName = connectedCellName + preference.registeredCellDataSIM1.cellIdLong;
                         }
                         fragment.connectedCellSIM1.setText(connectedCellName);
                         GlobalGUIRoutines.setImageButtonEnabled(
@@ -1358,7 +1445,10 @@ protected void onPostExecute(Void result) {
                             //    cellFlags = cellFlags + "C";
                             if (!cellFlags.isEmpty())
                                 connectedCellName = connectedCellName + "(" + cellFlags + ") ";
-                            connectedCellName = connectedCellName + preference.registeredCellDataSIM2.cellId;
+                            if (preference.registeredCellDataSIM2.cellId != Integer.MAX_VALUE)
+                                connectedCellName = connectedCellName + preference.registeredCellDataSIM2.cellId;
+                            else if (preference.registeredCellDataSIM2.cellIdLong != Long.MAX_VALUE)
+                                connectedCellName = connectedCellName + preference.registeredCellDataSIM2.cellIdLong;
                         }
                         fragment.connectedCellSIM2.setText(connectedCellName);
                         GlobalGUIRoutines.setImageButtonEnabled(
@@ -1383,7 +1473,10 @@ protected void onPostExecute(Void result) {
                         //    cellFlags = cellFlags + "C";
                         if (!cellFlags.isEmpty())
                             connectedCellName = connectedCellName + "(" + cellFlags + ") ";
-                        connectedCellName = connectedCellName + preference.registeredCellDataDefault.cellId;
+                        if (preference.registeredCellDataDefault.cellId != Integer.MAX_VALUE)
+                            connectedCellName = connectedCellName + preference.registeredCellDataDefault.cellId;
+                        else if (preference.registeredCellDataDefault.cellIdLong != Long.MAX_VALUE)
+                            connectedCellName = connectedCellName + preference.registeredCellDataDefault.cellIdLong;
                     }
                     fragment.connectedCellDefault.setText(connectedCellName);
                     GlobalGUIRoutines.setImageButtonEnabled(
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsListener.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsListener.java
index b4f2ba0d1f..792f587c57 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsListener.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsListener.java
@@ -6,16 +6,19 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
+import android.os.Build;
 import android.os.PowerManager;
 import android.service.notification.StatusBarNotification;
 import android.telephony.CellIdentityCdma;
 import android.telephony.CellIdentityGsm;
 import android.telephony.CellIdentityLte;
+import android.telephony.CellIdentityNr;
 import android.telephony.CellIdentityWcdma;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoCdma;
 import android.telephony.CellInfoGsm;
 import android.telephony.CellInfoLte;
+import android.telephony.CellInfoNr;
 import android.telephony.CellInfoWcdma;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
@@ -47,6 +50,7 @@ class MobileCellsListener extends PhoneStateListener {
 
     //private int simSlot = 0;
     int registeredCell = Integer.MAX_VALUE;
+    long registeredCellLong = Long.MAX_VALUE;
     long lastConnectedTime = 0;
 
     final MobileCellsScanner scanner;
@@ -84,36 +88,51 @@ private void getAllCellInfo(List<CellInfo> cellInfo) {
 
                     if (_cellInfo instanceof CellInfoGsm) {
                         CellIdentityGsm identityGsm = ((CellInfoGsm) _cellInfo).getCellIdentity();
-                        if (MobileCellsScanner.isValidCellId(identityGsm.getCid())) {
+                        if (MobileCellsScanner.isValidCellId(identityGsm.getCid(), Long.MAX_VALUE)) {
                             if (_cellInfo.isRegistered()) {
                                 registeredCell = identityGsm.getCid();
+                                registeredCellLong = Long.MAX_VALUE;
                                 lastConnectedTime = Calendar.getInstance().getTimeInMillis();
                                 isRegistered = true;
                             }
                         }
                     } else if (_cellInfo instanceof CellInfoLte) {
                         CellIdentityLte identityLte = ((CellInfoLte) _cellInfo).getCellIdentity();
-                        if (MobileCellsScanner.isValidCellId(identityLte.getCi())) {
+                        if (MobileCellsScanner.isValidCellId(identityLte.getCi(), Long.MAX_VALUE)) {
                             if (_cellInfo.isRegistered()) {
                                 registeredCell = identityLte.getCi();
+                                registeredCellLong = Long.MAX_VALUE;
                                 lastConnectedTime = Calendar.getInstance().getTimeInMillis();
                                 isRegistered = true;
                             }
                         }
                     } else if (_cellInfo instanceof CellInfoWcdma) {
                         CellIdentityWcdma identityWcdma = ((CellInfoWcdma) _cellInfo).getCellIdentity();
-                        if (MobileCellsScanner.isValidCellId(identityWcdma.getCid())) {
+                        if (MobileCellsScanner.isValidCellId(identityWcdma.getCid(), Long.MAX_VALUE)) {
                             if (_cellInfo.isRegistered()) {
                                 registeredCell = identityWcdma.getCid();
+                                registeredCellLong = Long.MAX_VALUE;
                                 lastConnectedTime = Calendar.getInstance().getTimeInMillis();
                                 isRegistered = true;
                             }
                         }
                     } else if (_cellInfo instanceof CellInfoCdma) {
                         CellIdentityCdma identityCdma = ((CellInfoCdma) _cellInfo).getCellIdentity();
-                        if (MobileCellsScanner.isValidCellId(identityCdma.getBasestationId())) {
+                        if (MobileCellsScanner.isValidCellId(identityCdma.getBasestationId(), Long.MAX_VALUE)) {
                             if (_cellInfo.isRegistered()) {
                                 registeredCell = identityCdma.getBasestationId();
+                                registeredCellLong = Long.MAX_VALUE;
+                                lastConnectedTime = Calendar.getInstance().getTimeInMillis();
+                                isRegistered = true;
+                            }
+                        }
+                    } else if ((Build.VERSION.SDK_INT >= 30) && (_cellInfo instanceof CellInfoNr)) {
+                        CellIdentityNr identityNr = (CellIdentityNr) _cellInfo.getCellIdentity();
+                        long nci = identityNr.getNci();
+                        if (MobileCellsScanner.isValidCellId(Integer.MAX_VALUE, nci)) {
+                            if (_cellInfo.isRegistered()) {
+                                registeredCell = Integer.MAX_VALUE;
+                                registeredCellLong = nci;
                                 lastConnectedTime = Calendar.getInstance().getTimeInMillis();
                                 isRegistered = true;
                             }
@@ -123,14 +142,15 @@ private void getAllCellInfo(List<CellInfo> cellInfo) {
                     if (isRegistered) {
                         anyRegistered = true;
                         DatabaseHandler db = DatabaseHandler.getInstance(context);
-                        db.updateMobileCellLastConnectedTime(registeredCell, lastConnectedTime);
-                        doAutoRegistration(registeredCell);
+                        db.updateMobileCellLastConnectedTime(registeredCell, registeredCellLong, lastConnectedTime);
+                        doAutoRegistration(registeredCell, registeredCellLong);
                     }
                 }
 
                 if (!anyRegistered) {
                     registeredCell = Integer.MAX_VALUE;
-                    doAutoRegistration(registeredCell);
+                    registeredCellLong = Long.MAX_VALUE;
+                    doAutoRegistration(registeredCell, registeredCellLong);
                 }
 
             }
@@ -290,29 +310,32 @@ private void getCellLocation(CellLocation location) {
 
                 if (location instanceof GsmCellLocation) {
                     GsmCellLocation gcLoc = (GsmCellLocation) location;
-                    if (MobileCellsScanner.isValidCellId(gcLoc.getCid())) {
+                    if (MobileCellsScanner.isValidCellId(gcLoc.getCid(), Long.MAX_VALUE)) {
                         registeredCell = gcLoc.getCid();
+                        registeredCellLong = Long.MAX_VALUE;
                         lastConnectedTime = Calendar.getInstance().getTimeInMillis();
                         DatabaseHandler db = DatabaseHandler.getInstance(context);
-                        db.updateMobileCellLastConnectedTime(registeredCell, lastConnectedTime);
-                        doAutoRegistration(registeredCell);
+                        db.updateMobileCellLastConnectedTime(registeredCell, registeredCellLong, lastConnectedTime);
+                        doAutoRegistration(registeredCell, registeredCellLong);
                         isRegistered = true;
                     }
                 } else if (location instanceof CdmaCellLocation) {
                     CdmaCellLocation ccLoc = (CdmaCellLocation) location;
-                    if (MobileCellsScanner.isValidCellId(ccLoc.getBaseStationId())) {
+                    if (MobileCellsScanner.isValidCellId(ccLoc.getBaseStationId(), Long.MAX_VALUE)) {
                         registeredCell = ccLoc.getBaseStationId();
+                        registeredCellLong = Long.MAX_VALUE;
                         lastConnectedTime = Calendar.getInstance().getTimeInMillis();
                         DatabaseHandler db = DatabaseHandler.getInstance(context);
-                        db.updateMobileCellLastConnectedTime(registeredCell, lastConnectedTime);
-                        doAutoRegistration(registeredCell);
+                        db.updateMobileCellLastConnectedTime(registeredCell, registeredCellLong, lastConnectedTime);
+                        doAutoRegistration(registeredCell, registeredCellLong);
                         isRegistered = true;
                     }
                 }
 
                 if (!isRegistered) {
                     registeredCell = Integer.MAX_VALUE;
-                    doAutoRegistration(registeredCell);
+                    registeredCellLong = Long.MAX_VALUE;
+                    doAutoRegistration(registeredCell, registeredCellLong);
                 }
 
             }
@@ -481,13 +504,14 @@ void handleEvents(final Context appContext) {
         */
     }
 
-    private void doAutoRegistration(final int _registeredCell) {
+    private void doAutoRegistration(final int _registeredCell, final long _registeredCellLong) {
         if (!PPApplicationStatic.getApplicationStarted(true, true))
             // application is not started
             return;
 
 //        PPApplicationStatic.logE("[TEST BATTERY] MobileCellsListener.doAutoRegistration", "******** ### *******");
 //        Log.e("MobileCellsListener.doAutoRegistration", "_registeredCell="+_registeredCell);
+//        Log.e("MobileCellsListener.doAutoRegistration", "_registeredCellLong="+_registeredCellLong);
 
 //        PPApplicationStatic.logE("[SYNCHRONIZED] MobileCellsListener.doAutoRegistration", "PPApplication.mobileCellsScannerMutex");
         synchronized (PPApplication.mobileCellsScannerMutex) {
@@ -557,13 +581,13 @@ private void doAutoRegistration(final int _registeredCell) {
             if (PPApplication.mobileCellsScannerEnabledAutoRegistration) {
                 //Log.e("MobileCellsListener.doAutoRegistration", "mobileCellsScannerEnabledAutoRegistration");
 
-                if (MobileCellsScanner.isValidCellId(_registeredCell)) {
+                if (MobileCellsScanner.isValidCellId(_registeredCell, _registeredCellLong)) {
 
-                    if (!db.isMobileCellSaved(_registeredCell)) {
+                    if (!db.isMobileCellSaved(_registeredCell, _registeredCellLong)) {
 
                         if (!PPApplication.mobileCellsScannerCellsNameForAutoRegistration.isEmpty()) {
                             List<MobileCellsData> localCellsList = new ArrayList<>();
-                            localCellsList.add(new MobileCellsData(_registeredCell,
+                            localCellsList.add(new MobileCellsData(_registeredCell, _registeredCellLong,
                                     PPApplication.mobileCellsScannerCellsNameForAutoRegistration, true, false,
                                     Calendar.getInstance().getTimeInMillis()//,
                                     //MobileCellsScanner.lastRunningEventsNotOutside,
@@ -624,6 +648,7 @@ private void doAutoRegistration(final int _registeredCell) {
                     // some event has configured moble cells sensor with configured cells
 
                     //Log.e("MobileCellsListener.doAutoRegistration", "_registeredCell="+_registeredCell);
+                    //Log.e("MobileCellsListener.doAutoRegistration", "_registeredCellLong="+_registeredCellLong);
 
                     if (MobileCellsScanner.isValidCellId(_registeredCell)) {
 
@@ -683,10 +708,10 @@ private void doAutoRegistration(final int _registeredCell) {
                 }
                 */
 
-                if (MobileCellsScanner.isValidCellId(_registeredCell)) {
+                if (MobileCellsScanner.isValidCellId(_registeredCell, _registeredCellLong)) {
                     // _registeredCell is added to database only in "Configured Cells" PPP preference dialog in
                     // RefreshListViewAsyncTask or by autoregistration
-                    if (!db.isMobileCellSaved(_registeredCell)) {
+                    if (!db.isMobileCellSaved(_registeredCell, _registeredCellLong)) {
 //                        Log.e("MobileCellsListener.doAutoRegistration", "_registeredCell not saved");
                         showNotification = true;
                     }
@@ -705,7 +730,13 @@ private void doAutoRegistration(final int _registeredCell) {
                         for (StatusBarNotification notification : notifications) {
                             String tag = notification.getTag();
                             if ((tag != null) && tag.contains(PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_TAG + "_")) {
-                                if (notification.getId() == _registeredCell + PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID) {
+                                //if (notification.getId() == _registeredCell + PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID) {
+                                int cellId;
+                                if (_registeredCell == Integer.MAX_VALUE)
+                                    cellId = Math.abs((int) _registeredCellLong);
+                                else
+                                    cellId = _registeredCell;
+                                if (notification.getId() == cellId + PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID) {
                                     isShown = true;
                                     break;
                                 }
@@ -720,7 +751,10 @@ private void doAutoRegistration(final int _registeredCell) {
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
                         String nText = context.getString(R.string.notification_not_used_mobile_cell_text1);
-                        nText = nText + " " + _registeredCell + ". ";
+                        if (_registeredCell != Integer.MAX_VALUE)
+                            nText = nText + " " + _registeredCell + ". ";
+                        else
+                            nText = nText + " " + _registeredCellLong + ". ";
                         nText = nText + context.getString(R.string.notification_not_used_mobile_cell_text2);
 
                         mBuilder = new NotificationCompat.Builder(context.getApplicationContext(), PPApplication.NOT_USED_MOBILE_CELL_NOTIFICATION_CHANNEL)
@@ -743,7 +777,13 @@ private void doAutoRegistration(final int _registeredCell) {
                         // add action button to disable not used cells detection
                         // Android 12 - this do not starts activity - OK
                         Intent disableDetectionIntent = new Intent(MobileCellsScanner.ACTION_NEW_MOBILE_CELLS_NOTIFICATION_DISABLE);
-                        disableDetectionIntent.putExtra("notificationId", _registeredCell + PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID);
+                        //disableDetectionIntent.putExtra("notificationId", _registeredCell + PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID);
+                        int cellId;
+                        if (_registeredCell != Integer.MAX_VALUE)
+                            cellId = _registeredCell;
+                        else
+                            cellId = Math.abs((int) _registeredCellLong);
+                        disableDetectionIntent.putExtra("notificationId", cellId + PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID);
                         PendingIntent pDisableDetectionIntent = PendingIntent.getBroadcast(context, 0, disableDetectionIntent, PendingIntent.FLAG_UPDATE_CURRENT);
                         NotificationCompat.Action.Builder actionBuilder = new NotificationCompat.Action.Builder(
                                 //R.drawable.ic_action_exit_app,
@@ -753,11 +793,12 @@ private void doAutoRegistration(final int _registeredCell) {
                         mBuilder.addAction(actionBuilder.build());
 
                         intent.putExtra(NotUsedMobileCellsDetectedActivity.EXTRA_MOBILE_CELL_ID, _registeredCell);
+                        intent.putExtra(NotUsedMobileCellsDetectedActivity.EXTRA_MOBILE_CELL_ID_LONG, _registeredCellLong);
                         intent.putExtra(NotUsedMobileCellsDetectedActivity.EXTRA_MOBILE_LAST_CONNECTED_TIME, lastConnectedTime);
                         //intent.putExtra(NotUsedMobileCellsDetectedActivity.EXTRA_MOBILE_LAST_RUNNING_EVENTS, MobileCellsScanner.lastRunningEventsNotOutside);
                         //intent.putExtra(NotUsedMobileCellsDetectedActivity.EXTRA_MOBILE_LAST_PAUSED_EVENTS, PPApplication.mobileCellsScannerLastPausedEvents);
 
-                        PendingIntent pi = PendingIntent.getActivity(context, _registeredCell, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                        PendingIntent pi = PendingIntent.getActivity(context, cellId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
                         mBuilder.setContentIntent(pi);
                         mBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
                         mBuilder.setWhen(0);
@@ -770,9 +811,12 @@ private void doAutoRegistration(final int _registeredCell) {
                         NotificationManagerCompat _mNotificationManager = NotificationManagerCompat.from(context);
                         try {
                             //_mNotificationManager.cancel(_registeredCell + NEW_MOBILE_CELLS_NOTIFICATION_ID);
+                            //_mNotificationManager.notify(
+                            //        PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_TAG + "_" + _registeredCell,
+                            //        PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID + _registeredCell, mBuilder.build());
                             _mNotificationManager.notify(
-                                    PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_TAG + "_" + registeredCell,
-                                    PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID + _registeredCell, mBuilder.build());
+                                    PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_TAG + "_" + cellId,
+                                    PPApplication.NEW_MOBILE_CELLS_NOTIFICATION_ID + cellId, mBuilder.build());
                         } catch (SecurityException en) {
                             PPApplicationStatic.logException("MobileCellsListener.doAutoRegistration", Log.getStackTraceString(en));
                         } catch (Exception e) {
@@ -793,7 +837,7 @@ private void doAutoRegistration(final int _registeredCell) {
 
             //if (forceStart) {
             if (PPApplication.mobileCellsForceStart || PPApplication.mobileCellsRegistraitonForceStart) {
-                if (MobileCellsScanner.isValidCellId(_registeredCell)) {
+                if (MobileCellsScanner.isValidCellId(_registeredCell, _registeredCellLong)) {
 //                    PPApplicationStatic.logE("[LOCAL_BROADCAST_CALL] MobileCellsListener.doAutoRegistration", "xxxx");
                     OneTimeWorkRequest worker =
                             new OneTimeWorkRequest.Builder(MainWorker.class)
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsScanner.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsScanner.java
index da3e54b44b..2f00e8be07 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsScanner.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/MobileCellsScanner.java
@@ -232,6 +232,16 @@ int getRegisteredCell(int forSimCard) {
             return mobileCellsListenerSIM2.registeredCell;
         return 0;
     }
+    long getRegisteredCellLong(int forSimCard) {
+//        PPApplicationStatic.logE("[TEST BATTERY] MobileCellsScanner.getRegisteredCellLong", "******** ### *******");
+        if ((forSimCard == 0) && (mobileCellsListenerDefault != null))
+            return mobileCellsListenerDefault.registeredCellLong;
+        if ((forSimCard == 1) && (mobileCellsListenerSIM1 != null))
+            return mobileCellsListenerSIM1.registeredCellLong;
+        if ((forSimCard == 2) && (mobileCellsListenerSIM2 != null))
+            return mobileCellsListenerSIM2.registeredCellLong;
+        return 0;
+    }
 
     long getLastConnectedTime(int forSimCard) {
 //        PPApplicationStatic.logE("[TEST BATTERY] MobileCellsScanner.getLastConnectedTime", "******** ### *******");
@@ -254,10 +264,17 @@ boolean isNotUsedCellsNotificationEnabled() {
             return ApplicationPreferences.applicationEventMobileCellNotUsedCellsDetectionNotificationEnabled;
     }
 
-    static boolean isValidCellId(int cid) {
+    static boolean isValidCellId(int cid, long cidl) {
 //        PPApplicationStatic.logE("[TEST BATTERY] MobileCellsScanner.isValidCellId", "******** ### *******");
-        return (cid != -1) && (cid != 0) /*&& (cid != 1)*/ && (cid != Integer.MAX_VALUE);
+        if (cid != Integer.MAX_VALUE)
+            return (cid != -1) && (cid != 0) /*&& (cid != 1)*/ /*&& (cid != Integer.MAX_VALUE)*/;
+        else
+            return (cidl != -1) && (cidl != 0) /*&& (cidl != 1)*/ && (cidl != Long.MAX_VALUE);
     }
+//    static boolean isValidCellIdNr(long cid) {
+//        PPApplicationStatic.logE("[TEST BATTERY] MobileCellsScanner.isValidCellId", "******** ### *******");
+//        return (cid != -1) && (cid != 0) /*&& (cid != 1)*/ && (cid != Long.MAX_VALUE);
+//    }
 
     static void startAutoRegistration(Context context, boolean forConnect) {
 //        PPApplicationStatic.logE("[TEST BATTERY] MobileCellsScanner.startAutoRegistration", "******** ### *******");
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/NotUsedMobileCellsDetectedActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/NotUsedMobileCellsDetectedActivity.java
index 5cafeb5305..9ded0b1742 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/NotUsedMobileCellsDetectedActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/NotUsedMobileCellsDetectedActivity.java
@@ -40,6 +40,7 @@ public class NotUsedMobileCellsDetectedActivity extends AppCompatActivity {
     EditText cellName;
 
     private int mobileCellId = Integer.MAX_VALUE;
+    private long mobileCellIdLong = Long.MAX_VALUE;
     private long lastConnectedTime = 0;
     //private String lastRunningEvents = "";
     //private String lastPausedEvents = "";
@@ -49,6 +50,7 @@ public class NotUsedMobileCellsDetectedActivity extends AppCompatActivity {
     private ShowDialogAsyncTask showDialogAsyncTask = null;
 
     static final String EXTRA_MOBILE_CELL_ID = "mobile_cell_id";
+    static final String EXTRA_MOBILE_CELL_ID_LONG = "mobile_cell_id_long";
     static final String EXTRA_MOBILE_LAST_CONNECTED_TIME = "last_connected_time";
     //static final String EXTRA_MOBILE_LAST_RUNNING_EVENTS = "last_running_events";
     //static final String EXTRA_MOBILE_LAST_PAUSED_EVENTS = "last_paused_events";
@@ -63,6 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent intent = getIntent();
         if (intent != null) {
             mobileCellId = intent.getIntExtra(EXTRA_MOBILE_CELL_ID, 0);
+            mobileCellIdLong = intent.getLongExtra(EXTRA_MOBILE_CELL_ID_LONG, 0);
             lastConnectedTime = intent.getLongExtra(EXTRA_MOBILE_LAST_CONNECTED_TIME, 0);
             //lastRunningEvents = intent.getStringExtra(EXTRA_MOBILE_LAST_RUNNING_EVENTS);
             //lastPausedEvents = intent.getStringExtra(EXTRA_MOBILE_LAST_PAUSED_EVENTS);
@@ -95,6 +98,7 @@ protected void onStart()
             // 2. test existence of event in table, may be deleted
 
             final int _mobileCellId = mobileCellId;
+            final long _mobileCellIdLong = mobileCellIdLong;
             final long _lastConnectedTime = lastConnectedTime;
             //final String _lastRunningEvents = lastRunningEvents;
             //final String _lastPausedEvents = lastPausedEvents;
@@ -121,7 +125,9 @@ protected void onStart()
 
                         // add or rename cell with _cellName
                         List<MobileCellsData> localCellsList = new ArrayList<>();
-                        localCellsList.add(new MobileCellsData(_mobileCellId, _cellName,
+                        localCellsList.add(new MobileCellsData(
+                                _mobileCellId, _mobileCellIdLong,
+                                _cellName,
                                 true, false, _lastConnectedTime/*, _lastRunningEvents, _lastPausedEvents, false*/));
                         db.saveMobileCellsList(localCellsList, true, true);
 
@@ -363,7 +369,13 @@ protected void onPostExecute(Void result) {
                         activity.cellName.setFocusable(true);
                         activity.cellName.requestFocus();
 
-                        activity.cellIdTextView.setText(activity.getString(R.string.not_used_mobile_cells_detected_cell_id) + " " + activity.mobileCellId);
+                        if (activity.mobileCellId != Integer.MAX_VALUE)
+                            activity.cellIdTextView.setText(
+                                    activity.getString(R.string.not_used_mobile_cells_detected_cell_id) + " " + activity.mobileCellId);
+                        else
+                            activity.cellIdTextView.setText(
+                                    activity.getString(R.string.not_used_mobile_cells_detected_cell_id) + " " + activity.mobileCellIdLong);
+
                         activity.lastConnectTimeTextView.setText(activity.getString(R.string.not_used_mobile_cells_detected_connection_time) + " " +
                                 StringFormatUtils.timeDateStringFromTimestamp(activity, activity.lastConnectedTime));
 
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/OneRowWidgetProvider.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/OneRowWidgetProvider.java
index 9c1f1ba7c3..c052e7906b 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/OneRowWidgetProvider.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/OneRowWidgetProvider.java
@@ -55,6 +55,7 @@ public void onUpdate(Context context, AppWidgetManager _appWidgetManager, final
     private static void _onUpdate(Context context, AppWidgetManager appWidgetManager,
                            /*Profile _profile, DataWrapper _dataWrapper,*/ int[] appWidgetIds)
     {
+        String applicationWidgetOneRowLauncher;
         String applicationWidgetOneRowIconLightness;
         String applicationWidgetOneRowIconColor;
         boolean applicationWidgetOneRowCustomIconLightness;
@@ -80,6 +81,7 @@ private static void _onUpdate(Context context, AppWidgetManager appWidgetManager
 //        PPApplicationStatic.logE("[SYNCHRONIZED] OneRowWidgetProvider._onUpdate", "PPApplication.applicationPreferencesMutex");
         synchronized (PPApplication.applicationPreferencesMutex) {
 
+            applicationWidgetOneRowLauncher = ApplicationPreferences.applicationWidgetOneRowLauncher;
             applicationWidgetOneRowIconLightness = ApplicationPreferences.applicationWidgetOneRowIconLightness;
             applicationWidgetOneRowIconColor = ApplicationPreferences.applicationWidgetOneRowIconColor;
             applicationWidgetOneRowCustomIconLightness = ApplicationPreferences.applicationWidgetOneRowCustomIconLightness;
@@ -773,7 +775,12 @@ private static void _onUpdate(Context context, AppWidgetManager appWidgetManager
                 //} else
                 //    remoteViews.setViewVisibility(R.id.widget_one_row_header_restart_events_click, View.GONE);
 
-                Intent intent = GlobalGUIRoutines.getIntentForStartupSource(context, PPApplication.STARTUP_SOURCE_WIDGET);
+                //Intent intent = GlobalGUIRoutines.getIntentForStartupSource(context, PPApplication.STARTUP_SOURCE_WIDGET);
+                Intent intent;
+                if (applicationWidgetOneRowLauncher.equals(StringConstants.EXTRA_ACTIVATOR))
+                    intent = new Intent(context.getApplicationContext(), ActivatorActivity.class);
+                else
+                    intent = new Intent(context.getApplicationContext(), EditorActivity.class);
                 // clear all opened activities
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_WIDGET);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAppNotification.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAppNotification.java
index 5d92ca71ed..44fbf33c41 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAppNotification.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAppNotification.java
@@ -28,7 +28,7 @@
 
 public class PPAppNotification {
 
-    static final String ACTION_START_LAUNCHER_FROM_NOTIFICATION = PPApplication.PACKAGE_NAME + ".PhoneProfilesService.ACTION_START_LAUNCHER_FROM_NOTIFICATION";
+    //static final String ACTION_START_LAUNCHER_FROM_NOTIFICATION = PPApplication.PACKAGE_NAME + ".PhoneProfilesService.ACTION_START_LAUNCHER_FROM_NOTIFICATION";
 
     static private void _showNotification(final DataWrapper dataWrapper, boolean forFirstStart)
     {
@@ -51,19 +51,9 @@ static private void _showNotification(final DataWrapper dataWrapper, boolean for
 //        PPApplicationStatic.logE("[PPP_NOTIFICATION] PPAppNotification._showNotification", "call of createPPPAppNotificationChannel()");
         PPApplicationStatic.createPPPAppNotificationChannel(appContext, false);
 
-        Intent launcherIntent;
-        if (Build.VERSION.SDK_INT < 31) {
-            launcherIntent = new Intent(ACTION_START_LAUNCHER_FROM_NOTIFICATION);
-        } else {
-            launcherIntent = GlobalGUIRoutines.getIntentForStartupSource(appContext, PPApplication.STARTUP_SOURCE_NOTIFICATION);
-            // clear all opened activities
-            launcherIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK/*|Intent.FLAG_ACTIVITY_NO_ANIMATION*/);
-            // setup startupSource
-            launcherIntent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_NOTIFICATION);
-        }
-
         Profile profile = null;
 
+        String applicationNotificationLauncher;
         String notificationNotificationStyle;
         boolean notificationShowProfileIcon;
         String notificationProfileIconColor;
@@ -88,6 +78,8 @@ static private void _showNotification(final DataWrapper dataWrapper, boolean for
         if (forFirstStart) {
 //            PPApplicationStatic.logE("[SYNCHRONIZED] PPAppNotification._showNotification", "(1) PPApplication.applicationPreferencesMutex");
             synchronized (PPApplication.applicationPreferencesMutex) {
+                applicationNotificationLauncher = ApplicationPreferences.applicationNotificationLauncher;
+
                 // load style directly from shared preferences
                 ApplicationPreferences.notificationNotificationStyle(appContext);
                 notificationNotificationStyle = ApplicationPreferences.notificationNotificationStyle;
@@ -121,6 +113,7 @@ static private void _showNotification(final DataWrapper dataWrapper, boolean for
 
 //            PPApplicationStatic.logE("[SYNCHRONIZED] PPAppNotification._showNotification", "(2) PPApplication.applicationPreferencesMutex");
             synchronized (PPApplication.applicationPreferencesMutex) {
+                applicationNotificationLauncher = ApplicationPreferences.applicationNotificationLauncher;
 
                 // load style directly from shared preferences
                 ApplicationPreferences.notificationNotificationStyle(appContext);
@@ -147,6 +140,22 @@ static private void _showNotification(final DataWrapper dataWrapper, boolean for
             }
         }
 
+        //noinspection ExtractMethodRecommender
+        Intent launcherIntent;
+        //if (Build.VERSION.SDK_INT < 31) {
+        //    launcherIntent = new Intent(ACTION_START_LAUNCHER_FROM_NOTIFICATION);
+        //} else {
+        //launcherIntent = GlobalGUIRoutines.getIntentForStartupSource(appContext, PPApplication.STARTUP_SOURCE_NOTIFICATION);
+        if (applicationNotificationLauncher.equals(StringConstants.EXTRA_ACTIVATOR))
+            launcherIntent = new Intent(appContext, ActivatorActivity.class);
+        else
+            launcherIntent = new Intent(appContext, EditorActivity.class);
+        // clear all opened activities
+        launcherIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK/*|Intent.FLAG_ACTIVITY_NO_ANIMATION*/);
+        // setup startupSource
+        launcherIntent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_NOTIFICATION);
+        //}
+
         int requestCode = 0;
         if (profile != null)
             requestCode = (int)profile._id;
@@ -483,9 +492,9 @@ static private void _showNotification(final DataWrapper dataWrapper, boolean for
         }
 
         PendingIntent pIntent;
-        if (Build.VERSION.SDK_INT < 31)
-            pIntent = PendingIntent.getBroadcast(appContext, requestCode, launcherIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        else
+        //if (Build.VERSION.SDK_INT < 31)
+        //    pIntent = PendingIntent.getBroadcast(appContext, requestCode, launcherIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        //else
             pIntent = PendingIntent.getActivity(appContext, requestCode, launcherIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         // ----- create notificationBuilders
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplication.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplication.java
index 1a28f08046..9e19660bf3 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplication.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplication.java
@@ -65,16 +65,22 @@ public class PPApplication extends Application
     // versions required for profile, event parameters
     static final int VERSION_CODE_EXTENDER_8_1_3 = 880;
     static final String VERSION_NAME_EXTENDER_8_1_3 = "8.1.3";
-
     // for this version will be displayed upgrade notification
     //  required must by <= latest
     static final int VERSION_CODE_EXTENDER_REQUIRED = 890;
-
     // latest version in GitHub, IzzyOnDroid. will be installed
     static final int VERSION_CODE_EXTENDER_LATEST = 900;         // must be <= as in Extender dependencies.gradle
     static final String VERSION_NAME_EXTENDER_LATEST = "8.1.6";  // must be <= as in Extender dependencies.gradle
     ///////
 
+    //// PPPPutSettings versions
+    // versions required for profile, event parameters
+    static final int VERSION_CODE_PPPPS_1_0_8 = 65;
+    static final String VERSION_NAME_PPPPS_1_0_8 = "1.0.8";
+    // for this version will be displayed upgrade notification
+    //  required must by <= latest
+    static final int VERSION_CODE_PPPPS_REQUIRED = 65;
+    // latest version in GitHub, IzzyOnDroid. will be installed
     static final int VERSION_CODE_PPPPS_LATEST = 65;             // must be <= as in PPPPS dependencies.gradle
     static final String VERSION_NAME_PPPPS_LATEST = "1.0.8";     // must be <= as in PPPPS dependencies.gradle
 
@@ -123,6 +129,15 @@ public class PPApplication extends Application
     static final String GITHUB_PPPE_URL = "https://github.com/henrichg/PhoneProfilesPlusExtender";
     static final String GITHUB_PPPPS_URL = "https://github.com/henrichg/PPPPutSettings";
     static final String XDA_DEVELOPERS_PPP_URL = "https://forum.xda-developers.com/t/phoneprofilesplus.3799429/";
+    static final String TWITTER_URL = "https://x.com/henrichg";
+    static final String REDDIT_URL = "https://www.reddit.com/user/henrichg/";
+    static final String BLUESKY_URL = "https://bsky.app/profile/henrichg.bsky.social";
+    static final String DISCORD_SERVER_URL = "https://discord.com/channels/1258733423426670633/1258733424504737936";
+    static final String DISCORD_INVITATION_URL = "https://discord.gg/Yb5hgAstQ3";
+    //static final String DISCORD_DISCUSSIION_URL = "https://discord.com/channels/1258733423426670633/1261142947743928410";
+    //static final String DISCORD_HELP_URL = "https://discord.com/channels/1258733423426670633/1261141698638250004";
+    //static final String DISCORD_BUGS_URL = "https://discord.com/channels/1258733423426670633/1261143124827312192";
+    //static final String DISCORD_SUGGESTIONS_URL = "https://discord.com/channels/1258733423426670633/1261143274895314976";
 
     // This url is Donate button from https://www.paypal.com/buttons/, type "Donate".
     // In it is possible to get this url with "Get link".
@@ -133,21 +148,32 @@ public class PPApplication extends Application
     // Used is GitHub Pages, not neded to use html type, this file is directly downloaded
     static final String PPP_RELEASES_MD_URL = "https://henrichg.github.io/PhoneProfilesPlus/releases.md";
 
+    static final String FDROID_PACKAGE_NAME = "org.fdroid.fdroid";
     static final String FDROID_PPP_RELEASES_URL = "https://apt.izzysoft.de/fdroid/index/apk/sk.henrichg.phoneprofilesplus";
     static final String FDROID_APPLICATION_URL = "https://www.f-droid.org/";
     static final String FDROID_REPOSITORY_URL = "https://apt.izzysoft.de/fdroid/index/info";
-    static final String FDROID_PACKAGE_NAME = "org.fdroid.fdroid";
 
     //static final String AMAZON_APPSTORE_PPP_RELEASES_URL = "https://www.amazon.com/Henrich-Gron-PhoneProfilesPlus/dp/B01N3SM44J/ref=sr_1_1?keywords=phoneprofilesplus&qid=1637084235&qsid=134-9049988-7816540&s=mobile-apps&sr=1-1&sres=B01N3SM44J%2CB078K93HFD%2CB01LXZDPDR%2CB00LBK7OSY%2CB07RX5L3CP%2CB07XM7WVS8%2CB07XWGWPH5%2CB08KXB3R7S%2CB0919N2P7J%2CB08NWD7K8H%2CB01A7MACL2%2CB07XY8YFQQ%2CB07XM8GDWC%2CB07QVYLDRL%2CB09295KQ9Q%2CB01LVZ3JBI%2CB08723759H%2CB09728VTDK%2CB08R7D4KZJ%2CB01BUIGF9K";
     //static final String AMAZON_APPSTORE_APPLICATION_URL = "https://www.amazon.com/gp/mas/get/amazonapp";
 
+    static final String APKPURE_PACKAGE_NAME = "com.apkpure.aegon";
     static final String APKPURE_PPP_RELEASES_URL = "https://m.apkpure.com/p/sk.henrichg.phoneprofilesplus";
     static final String APKPURE_APPLICATION_URL = "https://apkpure.com/apkpure/com.apkpure.aegon";
-    static final String APKPURE_PACKAGE_NAME = "com.apkpure.aegon";
 
+    static final String HUAWEI_APPGALLERY_PACKAGE_NAME = "com.huawei.appmarket";
     static final String HUAWEI_APPGALLERY_PPP_RELEASES_URL = "https://appgallery.cloud.huawei.com/ag/n/app/C104501059?channelId=PhoneProfilesPlus+application&id=957ced9f0ca648df8f253a3d1460051e&s=79376612D7DD2C824692C162FB2F957A7AEE81EE1471CDC58034CD5106DAB009&detailType=0&v=&callType=AGDLINK&installType=0000";
     static final String HUAWEI_APPGALLERY_APPLICATION_URL = "https://consumer.huawei.com/en/mobileservices/appgallery/";
-    static final String HUAWEI_APPGALLERY_PACKAGE_NAME = "com.huawei.appmarket";
+
+    static final String DROIDIFY_PACKAGE_NAME = "com.looker.droidify";
+    static final String DROIDIFY_APPLICATION_URL = "https://apt.izzysoft.de/fdroid/index/apk/com.looker.droidify";
+
+    static final String NEOSTORE_PACKAGE_NAME = "com.machiav3lli.fdroid";
+    static final String NEOSTORE_APPLICATION_URL = "https://apt.izzysoft.de/fdroid/index/apk/com.machiav3lli.fdroid";
+
+    static final String IZZY_PPP_RELEASES_URL = "https://apt.izzysoft.de/fdroid/index/apk/sk.henrichg.phoneprofilesplus";
+    static final String IZZY_PPP_LATEST_APK_RELEASE_URL_BEGIN = "https://apt.izzysoft.de/fdroid/repo/sk.henrichg.phoneprofilesplus_";
+    static final String IZZY_PPPE_LATEST_APK_RELEASE_URL_BEGIN = "https://apt.izzysoft.de/fdroid/repo/sk.henrichg.phoneprofilesplusextender_";
+    static final String IZZY_PPPPS_LATEST_APK_RELEASE_URL_BEGIN = "https://apt.izzysoft.de/fdroid/repo/sk.henrichg.pppputsettings_";
 
     //This file: https://github.com/henrichg/PhoneProfilesPlus/blob/master/docs/grant_g1_permission.md
     static final String HELP_HOW_TO_GRANT_G1_URL = "https://henrichg.github.io/PhoneProfilesPlus/grant_g1_permission.html";
@@ -161,21 +187,19 @@ public class PPApplication extends Application
     static final String HELP_AIRPLANE_MODE_RADIOS_CONFIG = "https://henrichg.github.io/PhoneProfilesPlus/airplane_mode_radios_config.html";
     static final String HELP_AIRPLANE_MODE_RADIOS_CONFIG_DEVEL = "https://github.com/henrichg/PhoneProfilesPlus/blob/devel/docs/airplane_mode_radios_config.md";
 
-    static final String DROIDIFY_PPP_RELEASES_URL = "https://apt.izzysoft.de/fdroid/index/apk/sk.henrichg.phoneprofilesplus";
-    static final String DROIDIFY_APPLICATION_URL = "https://apt.izzysoft.de/fdroid/index/apk/com.looker.droidify";
-    static final String DROIDIFY_PACKAGE_NAME = "com.looker.droidify";
-    static final String DROIDIFY_PPP_LATEST_APK_RELEASE_URL_BEGIN = "https://apt.izzysoft.de/fdroid/repo/sk.henrichg.phoneprofilesplus_";
-    static final String DROIDIFY_PPPE_LATEST_APK_RELEASE_URL_BEGIN = "https://apt.izzysoft.de/fdroid/repo/sk.henrichg.phoneprofilesplusextender_";
-    static final String DROIDIFY_PPPPS_LATEST_APK_RELEASE_URL_BEGIN = "https://apt.izzysoft.de/fdroid/repo/sk.henrichg.pppputsettings_";
-
     static final String GITHUB_PPPPS_RELEASES_URL = "https://github.com/henrichg/PPPPutSettings/releases";
     static final String GITHUB_PPPPS_DOWNLOAD_URL = "https://github.com/henrichg/PPPPutSettings/releases/latest/download/PPPPutSettings.apk";
     //This file: https://github.com/henrichg/PPPPutSettings/blob/main/docs/install_apk_from_pc.md
     //static final String GITHUB_PPPPS_HOW_TO_INSTALL_URL = "https://henrichg.github.io/PPPPutSettings/install_apk_from_pc.html";
     //static final String GITHUB_PPPPS_HOW_TO_INSTALL_URL_DEVEL = "https://github.com/henrichg/PPPPutSettings/blob/devel/docs/install_apk_from_pc.md";
 
-    //static final String GALAXY_STORE_PPP_RELEASES_URL = "https://galaxystore.samsung.com/detail/sk.henrichg.phoneprofilesplus";
+    static final String SHIUKU_HOW_TO_START_URL = "https://github.com/henrichg/PhoneProfilesPlus/blob/master/docs/shizuku.md";
+
+    // TODO change to latest version
+    static final String INSTALL_WITH_OPTIONS_DOWNLOAD_URL = "https://github.com/zacharee/InstallWithOptions/releases/download/0.6.1/InstallWithOptions_0.6.1-release.apk";
+
     //static final String GALAXY_STORE_PACKAGE_NAME = "com.sec.android.app.samsungapps";
+    //static final String GALAXY_STORE_PPP_RELEASES_URL = "https://galaxystore.samsung.com/detail/sk.henrichg.phoneprofilesplus";
 
     //static final boolean gitHubRelease = true;
     //static boolean googlePlayInstaller = false;
@@ -217,6 +241,8 @@ public class PPApplication extends Application
                                                 //+"|PhoneProfilesService.onTaskRemoved"
                                                 +"|PhoneProfilesService.onDestroy"
                                                 //+"|PhoneProfilesService.cancelWork"
+                                                +"|PhoneProfilesService.BINDER_RECEIVED_LISTENER"
+                                                +"|GrantShizukuPermissionActivity.onRequestPermissionsResult"
                                                 +"|DataWrapper.firstStartEvents"
                                                 //+"|DataWrapper.setProfileActive"
                                                 //+"|DataWrapper.activateProfileOnBoot"
@@ -394,6 +420,7 @@ public class PPApplication extends Application
     static final String PACKAGE_NAME_EXTENDER = "sk.henrichg.phoneprofilesplusextender";
     static final String PACKAGE_NAME_PP = "sk.henrichg.phoneprofiles";
     static final String PACKAGE_NAME_PPPPS = "sk.henrichg.pppputsettings";
+    //static final String PACKAGE_NAME_SHIZUKU = "moe.shizuku.privileged.api";
 
     static final String EXPORT_PATH = "/PhoneProfilesPlus";
     static final String LOG_FILENAME = "log.txt";
@@ -426,7 +453,7 @@ public class PPApplication extends Application
     static final int STARTUP_SOURCE_QUICK_TILE = 14;
     static final int STARTUP_SOURCE_EDITOR_SHOW_IN_ACTIVATOR_FILTER = 15;
     static final int STARTUP_SOURCE_EDITOR_SHOW_IN_EDITOR_FILTER = 16;
-    static final int STARTUP_SOURCE_EDITOR_WIDGET_HEADER = 17;
+    //static final int STARTUP_SOURCE_EDITOR_WIDGET_HEADER = 17;
 
     //static final int PREFERENCES_STARTUP_SOURCE_ACTIVITY = 1;
     //static final int PREFERENCES_STARTUP_SOURCE_FRAGMENT = 2;
@@ -644,6 +671,7 @@ public class PPApplication extends Application
 
     // WorkManager tags
     static final String AFTER_FIRST_START_WORK_TAG = "afterFirstStartWork";
+    static final String AFTER_SHIZUKU_START_WORK_TAG = "afterShizukuStartWork";
     //static final String PACKAGE_REPLACED_WORK_TAG = "packageReplacedWork";
     static final String AVOID_RESCHEDULE_RECEIVER_WORK_TAG = "avoidRescheduleReceiverWorker";
 
@@ -821,6 +849,7 @@ public class PPApplication extends Application
     static final ProfileListWidgetDatasetChangedMutex profileListWidgetDatasetChangedMutex = new ProfileListWidgetDatasetChangedMutex();
     static final SamsungEdgeDatasetChangedMutex samsungEdgeDatasetChangedMutex = new SamsungEdgeDatasetChangedMutex();
     static final DashClockWidgetMutex dashClockWidgetMutex = new DashClockWidgetMutex();
+    static final DynamicShortcutsMutex dynamicShortcutsMutex = new DynamicShortcutsMutex();
 
     //static PowerManager.WakeLock keepScreenOnWakeLock;
 
@@ -860,7 +889,9 @@ public class PPApplication extends Application
 
     //boolean willBeDoRestartEvents = false;
 
-    static final StartLauncherFromNotificationReceiver startLauncherFromNotificationReceiver = new StartLauncherFromNotificationReceiver();
+    static final DownloadCompletedBroadcastReceiver downloadCompletedBroadcastReceiver = new DownloadCompletedBroadcastReceiver();
+
+    //static final StartLauncherFromNotificationReceiver startLauncherFromNotificationReceiver = new StartLauncherFromNotificationReceiver();
     //static final UpdateGUIBroadcastReceiver updateGUIBroadcastReceiver = new UpdateGUIBroadcastReceiver();
     //static final ShowPPPAppNotificationBroadcastReceiver showPPPAppNotificationBroadcastReceiver = new ShowPPPAppNotificationBroadcastReceiver();
     static final RefreshActivitiesBroadcastReceiver refreshActivitiesBroadcastReceiver = new RefreshActivitiesBroadcastReceiver();
@@ -888,7 +919,6 @@ public class PPApplication extends Application
     static volatile TelephonyManager telephonyManagerSIM2 = null;
     static volatile TelephonyManager telephonyManagerDefault = null;
 
-
     static volatile RingerModeChangeReceiver ringerModeChangeReceiver = null;
     static volatile WifiStateChangedBroadcastReceiver wifiStateChangedBroadcastReceiver = null;
     static volatile NotUsedMobileCellsNotificationDisableReceiver notUsedMobileCellsNotificationDisableReceiver = null;
@@ -1121,6 +1151,8 @@ public void onCreate()
             return;
         }
 
+        RootUtils.initRoot();
+
 //        PPApplicationStatic.logE("[SYNCHRONIZED] PPApplication.onCreate", "PPApplication.applicationStartedMutex");
         synchronized (PPApplication.applicationStartedMutex) {
             PPApplication.exportIsRunning = false;
@@ -1361,8 +1393,6 @@ public void onAppNotResponding(ANRError error) {
         JobManager.create(this).addJobCreator(new PPJobsCreator());
         */
 
-        RootUtils.initRoot();
-
         /*
         try {
             ViewConfiguration config = ViewConfiguration.get(this);
@@ -1585,6 +1615,7 @@ private void startPPServiceWhenNotStarted(final Context context) {
                         serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
                         serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
                         serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+                        serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //                        PPApplicationStatic.logE("[START_PP_SERVICE] PPApplication.startPPServiceWhenNotStarted", "(1)");
                         PPApplicationStatic.startPPService(appContext, serviceIntent, true);
                     }
@@ -1703,7 +1734,7 @@ static void forceUpdateGUI(Context context, boolean alsoEditor, boolean alsoNoti
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent5);
 
         // dynamic shortcuts
-        DataWrapperStatic.setDynamicLauncherShortcuts(context);
+        DataWrapperStatic.setDynamicLauncherShortcuts(context, false);
 
         // restart tile - this invoke onStartListening()
         // require in manifest file for TileService this meta data:
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplicationStatic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplicationStatic.java
index 697e4a83de..40e8f3b468 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplicationStatic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPApplicationStatic.java
@@ -56,6 +56,10 @@
 /** @noinspection ExtractMethodRecommender*/
 class PPApplicationStatic {
 
+    private PPApplicationStatic() {
+        // private constructor to prevent instantiation
+    }
+
     /** @noinspection BlockingMethodInNonBlockingContext*/
     static void _cancelWork(final String name, final boolean forceCancel) {
         WorkManager workManager = PPApplication.getWorkManagerInstance();
@@ -517,42 +521,42 @@ static void logE(String tag, String text) {
 
     @SuppressLint("MissingPermission")
     static void logException(String tag, String text) {
-        if (!logEnabled())
-            return;
-
-        if (logContainsFilterTag(tag)) {
-            //if (logIntoLogCat) Log.e(tag, text);
-            if (PPApplication.logIntoLogCat)
-                Log.e("[EXCEPTION] " + tag, "[ " + tag + " ]" + StringConstants.STR_COLON_WITH_SPACE + text);
-            logIntoFile("E", tag, text, true);
-
-            if (DebugVersion.enabled && (PPApplication.getInstance() != null)) {
-                Context appContext = PPApplication.getInstance().getApplicationContext();
-                createExclamationNotificationChannel(appContext, false);
-                NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(appContext, PPApplication.EXCLAMATION_NOTIFICATION_CHANNEL)
-                        .setColor(ContextCompat.getColor(appContext, R.color.error_color))
-                        .setSmallIcon(R.drawable.ic_ppp_notification/*ic_exclamation_notify*/) // notification icon
-                        .setLargeIcon(BitmapFactory.decodeResource(appContext.getResources(), R.drawable.ic_exclamation_notification))
-                        .setContentTitle("App exception occured!!") // title for notification
-                        .setContentText("Read log.txt") // message for notification
-                        .setAutoCancel(true); // clear notification after click
-                //mBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));
-                mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
-                mBuilder.setCategory(NotificationCompat.CATEGORY_RECOMMENDATION);
-                mBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
-
-                mBuilder.setGroup(PPApplication.APP_EXCEPTION_NOTIFICATION_GROUP);
-
-                Notification notification = mBuilder.build();
-
-                NotificationManagerCompat mNotificationManager = NotificationManagerCompat.from(appContext);
-                try {
-                    mNotificationManager.notify(PPApplication.APP_EXCEPTION_NOTIFICATION_TAG, PPApplication.APP_EXCEPTION_NOTIFICATION_ID, notification);
-                } catch (Exception en) {
-                    Log.e("PPApplicationStatic.logException", Log.getStackTraceString(en));
+        if (logEnabled()) {
+            if (logContainsFilterTag(tag)) {
+                //if (logIntoLogCat) Log.e(tag, text);
+                if (PPApplication.logIntoLogCat)
+                    Log.e("[EXCEPTION] " + tag, "[ " + tag + " ]" + StringConstants.STR_COLON_WITH_SPACE + text);
+                logIntoFile("E", tag, text, true);
+
+                if (DebugVersion.enabled && (PPApplication.getInstance() != null)) {
+                    Context appContext = PPApplication.getInstance().getApplicationContext();
+                    createExclamationNotificationChannel(appContext, false);
+                    NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(appContext, PPApplication.EXCLAMATION_NOTIFICATION_CHANNEL)
+                            .setColor(ContextCompat.getColor(appContext, R.color.error_color))
+                            .setSmallIcon(R.drawable.ic_ppp_notification/*ic_exclamation_notify*/) // notification icon
+                            .setLargeIcon(BitmapFactory.decodeResource(appContext.getResources(), R.drawable.ic_exclamation_notification))
+                            .setContentTitle("App exception occured!!") // title for notification
+                            .setContentText("Read log.txt") // message for notification
+                            .setAutoCancel(true); // clear notification after click
+                    //mBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));
+                    mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
+                    mBuilder.setCategory(NotificationCompat.CATEGORY_RECOMMENDATION);
+                    mBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
+
+                    mBuilder.setGroup(PPApplication.APP_EXCEPTION_NOTIFICATION_GROUP);
+
+                    Notification notification = mBuilder.build();
+
+                    NotificationManagerCompat mNotificationManager = NotificationManagerCompat.from(appContext);
+                    try {
+                        mNotificationManager.notify(PPApplication.APP_EXCEPTION_NOTIFICATION_TAG, PPApplication.APP_EXCEPTION_NOTIFICATION_ID, notification);
+                    } catch (Exception en) {
+                        Log.e("PPApplicationStatic.logException", Log.getStackTraceString(en));
+                    }
                 }
             }
-        }
+        } else
+            Log.e(tag, text);
     }
 
     /*
@@ -758,7 +762,13 @@ static void loadApplicationPreferences(Context context) {
             ApplicationPreferences.notificationPrefIndicator(context);
             ApplicationPreferences.notificationPrefIndicatorLightness(context);
             //ApplicationPreferences.applicationHomeLauncher(context);
-            ApplicationPreferences.applicationWidgetLauncher(context);
+
+            //ApplicationPreferences.applicationWidgetLauncher(context);
+            ApplicationPreferences.applicationIconWidgetLauncher(context);
+            ApplicationPreferences.applicationOneRowWidgetLauncher(context);
+            ApplicationPreferences.applicationListWidgetLauncher(context);
+            ApplicationPreferences.applicationDashClockWidgetLauncher(context);
+
             ApplicationPreferences.applicationNotificationLauncher(context);
             ApplicationPreferences.applicationEventWifiScanInterval(context);
             ApplicationPreferences.applicationDefaultProfile(context);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAudioPlaybackCallback.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAudioPlaybackCallback.java
index 4561336a3a..7c57f30e9e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAudioPlaybackCallback.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPAudioPlaybackCallback.java
@@ -18,7 +18,10 @@ public class PPAudioPlaybackCallback extends  AudioManager.AudioPlaybackCallback
     @Override
     public void onPlaybackConfigChanged(List<AudioPlaybackConfiguration> configs) {
         // play media from PPP is ignored
-        if ((RingtonePreference.mediaPlayer != null) || (VolumeDialogPreferenceFragment.mediaPlayer != null))
+        if ((RingtonePreference.mediaPlayer != null) ||
+                (VolumeDialogPreferenceFragment.mediaPlayer != null)/* ||
+                not needed to test it, it uses ALARM channel
+                (PlayRingingNotification.ringingMediaPlayer != null)*/)
             return;
 
         // Iterate all playback configurations
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPEditTextAlertDialog.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPEditTextAlertDialog.java
new file mode 100644
index 0000000000..ee1c6459d3
--- /dev/null
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPEditTextAlertDialog.java
@@ -0,0 +1,87 @@
+package sk.henrichg.phoneprofilesplus;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+class PPEditTextAlertDialog {
+    final AlertDialog mDialog;
+    final Activity activity;
+    final EditText editText;
+
+    /** @noinspection SameParameterValue*/
+    PPEditTextAlertDialog(CharSequence _title, CharSequence _label,
+                          String _initialEditValue,
+                          CharSequence _positiveText, CharSequence _negativeText,
+                          DialogInterface.OnClickListener _positiveClick,
+                          DialogInterface.OnClickListener _negativeClick,
+                          DialogInterface.OnCancelListener _cancelListener,
+                          boolean _cancelable,
+                          boolean _canceledOnTouchOutside,
+                          boolean _hideButtonBarDivider,
+                          Activity _activity) {
+        this.activity = _activity;
+        /*
+        this.positiveClick = _positiveClick;
+        this.negativeClick = _negativeClick;
+        this.neutralClick = _neutralClick;
+        */
+
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+        dialogBuilder.setTitle(_title);
+        dialogBuilder.setCancelable(true);
+        //dialogBuilder.setNegativeButton(android.R.string.cancel, null);
+
+        LayoutInflater inflater = activity.getLayoutInflater();
+        View layout = inflater.inflate(R.layout.dialog_with_edittext, null);
+        dialogBuilder.setView(layout);
+
+        dialogBuilder.setPositiveButton(_positiveText, _positiveClick);
+        if (_negativeText != null)
+            dialogBuilder.setNegativeButton(_negativeText, _negativeClick);
+
+        if (_cancelListener != null)
+            dialogBuilder.setOnCancelListener(_cancelListener);
+
+        dialogBuilder.setCancelable(_cancelable);
+
+        mDialog = dialogBuilder.create();
+
+        //mDialog.setOnShowListener(dialog -> doShow());
+
+        TextView messageText = layout.findViewById(R.id.dialog_with_edittext_label);
+        messageText.setText(_label);
+
+        editText = layout.findViewById(R.id.dialog_with_edittext_edit);
+        editText.setText(_initialEditValue);
+        editText.requestFocus();
+
+        View buttonsDivider = layout.findViewById(R.id.dialog_with_edittext_buttonBarDivider);
+        if (_hideButtonBarDivider)
+            buttonsDivider.setVisibility(View.GONE);
+        else
+            buttonsDivider.setVisibility(View.VISIBLE);
+
+        mDialog.setCanceledOnTouchOutside(_canceledOnTouchOutside);
+
+    }
+
+    /*
+    private void doShow() {
+        mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setVisibility(View.GONE);
+        SingleSelectListDialogAdapter listAdapter = new SingleSelectListDialogAdapter(itemsRes, this);
+        listView.setAdapter(listAdapter);
+    }
+    */
+
+    void show() {
+        if (!activity.isFinishing())
+            mDialog.show();
+    }
+
+}
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPExecutors.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPExecutors.java
index 8b8c3477ee..19159d9714 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPExecutors.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPExecutors.java
@@ -44,6 +44,10 @@ class PPExecutors {
     static final String SENSOR_NAME_SENSOR_TYPE_WIFI_SCANNER = "SENSOR_TYPE_WIFI_SCANNER";
     static final String SENSOR_NAME_SENSOR_TYPE_APPLICATION_EVENT_END = "SENSOR_TYPE_APPLICATION_EVENT_END";
 
+    private PPExecutors() {
+        // private constructor to prevent instantiation
+    }
+
     static void scheduleDisableBlockProfileEventActionExecutor() {
 //        PPApplicationStatic.logE("[EXECUTOR_CALL]  ***** PPExecutors.scheduleDisableBlockProfileEventActionExecutor", "schedule");
 
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreference.java
index a61672859d..4265fd031b 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreference.java
@@ -14,22 +14,26 @@ public class PPPPSDialogPreference extends DialogPreference {
     final Context _context;
 
     // Custom xml attributes.
-    //String forPreference;
+    final int requiredPPPPSVersionCode;
+    String requiredPPPPSVersionName;
 
     public PPPPSDialogPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         _context = context;
 
-        /*
-        TypedArray typedArray = context.obtainStyledAttributes(attrs,
-                R.styleable.PPppppsDialogPreference);
+//        TypedArray typedArray = context.obtainStyledAttributes(attrs,
+//                R.styleable.PPPPSDialogPreference);
 
-        forPreference = typedArray.getString(
-                R.styleable.PPppppsDialogPreference_forPreference);
+//        requiredPPPPSVersionCode = typedArray.getInt(
+//                R.styleable.PPPPSDialogPreference_requiredPPPPSVersionCode, PPApplication.VERSION_CODE_PPPPS_1_0_8);
+//        requiredPPPPSVersionName = typedArray.getString(
+//                R.styleable.PPPPSDialogPreference_requiredPPPPSVersionName);
+        requiredPPPPSVersionCode = PPApplication.VERSION_CODE_PPPPS_1_0_8;
+        if ((requiredPPPPSVersionName == null) || (requiredPPPPSVersionName.isEmpty()))
+            requiredPPPPSVersionName = PPApplication.VERSION_NAME_PPPPS_1_0_8;
 
-        typedArray.recycle();
-        */
+//        typedArray.recycle();
     }
 
     @Override
@@ -57,9 +61,9 @@ private void setSummaryPPPPSDP()
             String ppppsVersionName = ActivateProfileHelper.getPPPPutSettingsVersionName(_context);
             prefVolumeDataSummary =  _context.getString(R.string.pppps_pref_dialog_install_pppps_installed_version) +
                     " "+StringConstants.TAG_BOLD_START_HTML + ppppsVersionName + " (" + ppppsVersion + ")"+StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_BREAK_HTML;
-            prefVolumeDataSummary = prefVolumeDataSummary + _context.getString(R.string.pppps_pref_dialog_install_pppps_latest_version) +
-                    " "+StringConstants.TAG_BOLD_START_HTML + PPApplication.VERSION_NAME_PPPPS_LATEST + " (" + PPApplication.VERSION_CODE_PPPPS_LATEST + ")"+StringConstants.TAG_BOLD_END_HTML;
-            if (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_LATEST)
+            prefVolumeDataSummary = prefVolumeDataSummary + _context.getString(R.string.install_extender_required_version) +
+                    " "+StringConstants.TAG_BOLD_START_HTML + requiredPPPPSVersionName + " (" + requiredPPPPSVersionCode + ")"+StringConstants.TAG_BOLD_END_HTML;
+            if (ppppsVersion < requiredPPPPSVersionCode)
                 prefVolumeDataSummary = prefVolumeDataSummary + StringConstants.TAG_DOUBLE_BREAK_HTML +StringConstants.TAG_BOLD_START_HTML + _context.getString(R.string.pppps_pref_dialog_PPPPutSettings_new_version_summary) + StringConstants.TAG_BOLD_END_HTML;
             else
                 prefVolumeDataSummary = prefVolumeDataSummary + StringConstants.TAG_DOUBLE_BREAK_HTML + _context.getString(R.string.pppps_pref_dialog_PPPPutSettings_upgrade_summary);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreferenceFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreferenceFragment.java
index 8ab12a4bfb..7dbab8785d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreferenceFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPPPSDialogPreferenceFragment.java
@@ -1,7 +1,10 @@
 package sk.henrichg.phoneprofilesplus;
 
+import static android.os.Environment.DIRECTORY_DOWNLOADS;
+
 import android.app.Activity;
 import android.app.Dialog;
+import android.app.DownloadManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -18,6 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -72,8 +76,8 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 String ppppsVersionName = ActivateProfileHelper.getPPPPutSettingsVersionName(prefContext);
                 prefVolumeDataSummary =  prefContext.getString(R.string.pppps_pref_dialog_install_pppps_installed_version) +
                         " "+StringConstants.TAG_BOLD_START_HTML + ppppsVersionName + " (" + ppppsVersion + ")"+StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_BREAK_HTML;
-                prefVolumeDataSummary = prefVolumeDataSummary + prefContext.getString(R.string.pppps_pref_dialog_install_pppps_latest_version) +
-                        " "+StringConstants.TAG_BOLD_START_HTML + PPApplication.VERSION_NAME_PPPPS_LATEST + " (" + PPApplication.VERSION_CODE_PPPPS_LATEST + ")"+StringConstants.TAG_BOLD_END_HTML;
+                prefVolumeDataSummary = prefVolumeDataSummary + prefContext.getString(R.string.install_extender_required_version) +
+                        " "+StringConstants.TAG_BOLD_START_HTML + preference.requiredPPPPSVersionName + " (" + preference.requiredPPPPSVersionCode + ")"+StringConstants.TAG_BOLD_END_HTML;
                 if (ppppsVersion < PPApplication.VERSION_CODE_PPPPS_LATEST)
                     prefVolumeDataSummary = prefVolumeDataSummary + StringConstants.TAG_DOUBLE_BREAK_HTML + prefContext.getString(R.string.pppps_pref_dialog_PPPPutSettings_new_version_summary);
                 else
@@ -141,35 +145,9 @@ private static void installPPPPutSettingsFromGitHub(final Activity activity,
         dialogText = dialogText + activity.getString(R.string.pppps_pref_dialog_install_pppps_latest_version) +
                 " "+StringConstants.TAG_BOLD_START_HTML + PPApplication.VERSION_NAME_PPPPS_LATEST + " (" + PPApplication.VERSION_CODE_PPPPS_LATEST + ")"+StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_DOUBLE_BREAK_HTML;
 
-        if (Build.VERSION.SDK_INT < 34) {
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text1) + " \"" + activity.getString(R.string.alert_button_install) + "\""+StringConstants.TAG_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text2) + StringConstants.TAG_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text3) + StringConstants.TAG_DOUBLE_BREAK_HTML;
-        } else {
-//            dialogText = dialogText + activity.getString(R.string.install_pppps_text6) + StringConstants.TAG_DOUBLE_BREAK_HTML;
-//            dialogText = dialogText + activity.getString(R.string.install_pppps_text7) + " \"" + activity.getString(R.string.install_pppps_alert_button_how_to_install) + "\" ";
-//            dialogText = dialogText + activity.getString(R.string.install_pppps_text7a) + StringConstants.TAG_BREAK_HTML;
-//            dialogText = dialogText + activity.getString(R.string.install_pppps_text8) + " ";
-//            dialogText = dialogText + activity.getString(R.string.install_pppps_text9) + "."+StringConstants.TAG_DOUBLE_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text10) + StringConstants.TAG_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text11) + StringConstants.TAG_DOUBLE_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text12) + StringConstants.TAG_BREAK_HTML;
-            String url = "https://github.com/henrichg/PhoneProfilesPlus/blob/master/docs/shizuku.md";
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text13) + " " +
-                    StringConstants.TAG_URL_LINK_START_HTML + url + StringConstants.TAG_URL_LINK_START_URL_END_HTML + url+ StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+StringConstants.TAG_URL_LINK_END_HTML +
-                    StringConstants.TAG_BREAK_HTML;
-            url = "https://github.com/zacharee/InstallWithOptions/releases/latest/download/InstallWithOptions_0.4.3-release.apk";
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text14) + " " +
-                    StringConstants.TAG_URL_LINK_START_HTML + url + StringConstants.TAG_URL_LINK_START_URL_END_HTML + url+ StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+StringConstants.TAG_URL_LINK_END_HTML +
-                    StringConstants.TAG_BREAK_HTML;
-            url = "https://github.com/henrichg/PPPPutSettings/releases/latest/download/PPPPutSettings.apk";
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text15) + " " +
-                    StringConstants.TAG_URL_LINK_START_HTML + url + StringConstants.TAG_URL_LINK_START_URL_END_HTML + url+ StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+StringConstants.TAG_URL_LINK_END_HTML +
-                    StringConstants.TAG_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text16) + StringConstants.TAG_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text17) + StringConstants.TAG_BREAK_HTML;
-            dialogText = dialogText + activity.getString(R.string.install_pppps_text18) + StringConstants.TAG_DOUBLE_BREAK_HTML;
-        }
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text1) + " \"" + activity.getString(R.string.alert_button_install) + "\""+StringConstants.TAG_BREAK_HTML;
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text2) + StringConstants.TAG_BREAK_HTML;
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text3) + StringConstants.TAG_DOUBLE_BREAK_HTML;
         dialogText = dialogText + StringConstants.TAG_BOLD_START_HTML + activity.getString(R.string.install_pppps_text5) + StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_DOUBLE_BREAK_HTML;
         dialogText = dialogText + activity.getString(R.string.install_pppps_text4);
 
@@ -177,12 +155,15 @@ private static void installPPPPutSettingsFromGitHub(final Activity activity,
         text.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
         text.setMovementMethod(LinkMovementMethod.getInstance());
 
-        if (Build.VERSION.SDK_INT < 34) {
-            dialogBuilder.setPositiveButton(activity.getString(R.string.alert_button_install), (dialog, which) -> {
-                String url = PPApplication.GITHUB_PPPPS_DOWNLOAD_URL;
+        dialogBuilder.setPositiveButton(activity.getString(R.string.alert_button_install), (dialog, which) -> {
+            String url = PPApplication.GITHUB_PPPPS_DOWNLOAD_URL;
 
+            // DownloadManager not working in Huawei P40
+            // https://stackoverflow.com/questions/44093939/how-to-use-downloadmanager-on-huawei
+            //if (PPApplication.deviceIsHuawei && PPApplication.romIsEMUI) {
                 Intent i = new Intent(Intent.ACTION_VIEW);
                 i.setData(Uri.parse(url));
+                i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                 try {
                     activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
                     if ((_preference != null) && (_preference.fragment != null))
@@ -196,37 +177,42 @@ private static void installPPPPutSettingsFromGitHub(final Activity activity,
                     if (finishActivity)
                         activity.finish();
                 }
-            });
-        } /*else {
-
-            dialogBuilder.setPositiveButton(activity.getString(R.string.install_pppps_alert_button_how_to_install), (dialog, which) -> {
-                String url;
-                if (DebugVersion.enabled)
-                    url = PPApplication.GITHUB_PPPPS_HOW_TO_INSTALL_URL_DEVEL;
-                else
-                    url = PPApplication.GITHUB_PPPPS_HOW_TO_INSTALL_URL;
-
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse(url));
+            /*}
+            else {
                 try {
-                    activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    String textToast = activity.getString(R.string.downloading_toast_text);
+                    PPApplication.showToast(activity.getApplicationContext(), textToast, Toast.LENGTH_LONG);
+
+                    Uri Download_Uri = Uri.parse(url);
+                    DownloadManager.Request request = new DownloadManager.Request(Download_Uri);
+
+                    //Restrict the types of networks over which this download may proceed.
+                    request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE);
+                    //Set whether this download may proceed over a roaming connection.
+                    request.setAllowedOverRoaming(false);
+                    //Set the title of this download, to be displayed in notifications (if enabled).
+                    request.setTitle(activity.getString(R.string.download_pppps_title));
+                    //Set a description of this download, to be displayed in notifications (if enabled)
+                    request.setDescription(activity.getString(R.string.downloading_file_description));
+                    //Set the local destination for the downloaded file to a path within the application's external files directory
+                    request.setDestinationInExternalPublicDir(DIRECTORY_DOWNLOADS, "PPPPutSettings.apk");
+                    //request.allowScanningByMediaScanner();
+                    request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                    //Enqueue a new download and same the referenceId
+                    DownloadManager downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
+                    DownloadCompletedBroadcastReceiver.downloadReferencePPPPS = downloadManager.enqueue(request);
                     if ((_preference != null) && (_preference.fragment != null))
                         _preference.fragment.dismiss();
                     if (finishActivity)
                         activity.finish();
                 } catch (Exception e) {
-                    PPApplicationStatic.recordException(e);
                     if ((_preference != null) && (_preference.fragment != null))
                         _preference.fragment.dismiss();
                     if (finishActivity)
                         activity.finish();
                 }
-            });
-
-        }
-        dialogBuilder.setNegativeButton(android.R.string.cancel, null);*/
-        dialogBuilder.setPositiveButton(android.R.string.ok, null);
-
+            }*/
+        });
         //dialogBuilder.setCancelable(false);
         /*dialogBuilder.setOnCancelListener(dialog -> {
             if (finishActivity)
@@ -274,6 +260,255 @@ public void onClick(@NonNull View textView) {
         text.setText(sbt);
         text.setMovementMethod(LinkMovementMethod.getInstance());
 
+//        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+//            @Override
+//            public void onShow(DialogInterface dialog) {
+//                Button positive = ((AlertDialog)dialog).getButton(DialogInterface.BUTTON_POSITIVE);
+//                if (positive != null) positive.setAllCaps(false);
+//                Button negative = ((AlertDialog)dialog).getButton(DialogInterface.BUTTON_NEGATIVE);
+//                if (negative != null) negative.setAllCaps(false);
+//            }
+//        });
+
+        if (!activity.isFinishing())
+            dialog.show();
+
+    }
+
+    private static void installPPPPutSettingsFromGitHub34(final Activity activity,
+                                                        final PPPPSDialogPreference _preference,
+                                                        boolean finishActivity) {
+        if (activity == null) {
+            return;
+        }
+
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+        dialogBuilder.setTitle(activity.getString(R.string.install_pppps_dialog_title));
+
+        LayoutInflater inflater = activity.getLayoutInflater();
+        View layout = inflater.inflate(R.layout.dialog_install_pppps_34, null);
+        dialogBuilder.setView(layout);
+
+        String dialogText = "";
+
+        int ppppsVersion = ActivateProfileHelper.isPPPPutSettingsInstalled(activity.getApplicationContext());
+        if (ppppsVersion != 0) {
+            String ppppsVersionName = ActivateProfileHelper.getPPPPutSettingsVersionName(activity.getApplicationContext());
+            dialogText = dialogText + activity.getString(R.string.pppps_pref_dialog_install_pppps_installed_version) + " "+StringConstants.TAG_BOLD_START_HTML + ppppsVersionName + " (" + ppppsVersion + ")"+StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_BREAK_HTML;
+        }
+        dialogText = dialogText + activity.getString(R.string.pppps_pref_dialog_install_pppps_latest_version) +
+                " "+StringConstants.TAG_BOLD_START_HTML + PPApplication.VERSION_NAME_PPPPS_LATEST + " (" + PPApplication.VERSION_CODE_PPPPS_LATEST + ")"+StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_DOUBLE_BREAK_HTML;
+
+        TextView text0 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text0);
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text10) + StringConstants.TAG_BREAK_HTML;
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text11) + StringConstants.TAG_DOUBLE_BREAK_HTML;
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text12) + StringConstants.TAG_BREAK_HTML;
+        text0.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
+
+        TextView text1 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text1);
+        String url = PPApplication.SHIUKU_HOW_TO_START_URL;
+        dialogText = activity.getString(R.string.install_pppps_text13) + " " +
+                StringConstants.TAG_URL_LINK_START_HTML + url + StringConstants.TAG_URL_LINK_START_URL_END_HTML + url+ StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+StringConstants.TAG_URL_LINK_END_HTML;
+        text1.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
+        text1.setMovementMethod(LinkMovementMethod.getInstance());
+
+        TextView text2 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text2);
+        url = PPApplication.INSTALL_WITH_OPTIONS_DOWNLOAD_URL;
+        CharSequence str1Text2 = activity.getString(R.string.install_pppps_text14);
+        CharSequence str2Text2 = str1Text2 + " " + url + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
+        Spannable sbt = new SpannableString(str2Text2);
+        sbt.setSpan(new StyleSpan(android.graphics.Typeface.NORMAL), 0, str1Text2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        ClickableSpan clickableSpanText2 = new ClickableSpan() {
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setColor(ds.linkColor);    // you can use custom color
+                ds.setUnderlineText(false);    // this remove the underline
+            }
+
+            @Override
+            public void onClick(@NonNull View textView) {
+                if (PPApplication.deviceIsSamsung && PPApplication.romIsGalaxy) {
+                    // In One UI is bug in ststem downloader. Chrome, as default browser, do not downlaod
+                    // For this reason used is DownloadManager
+                    try {
+                        String text = activity.getString(R.string.downloading_toast_text);
+                        PPApplication.showToast(activity.getApplicationContext(), text, Toast.LENGTH_LONG);
+
+                        String url = PPApplication.INSTALL_WITH_OPTIONS_DOWNLOAD_URL;
+                        Uri Download_Uri = Uri.parse(url);
+                        DownloadManager.Request request = new DownloadManager.Request(Download_Uri);
+
+                        //Restrict the types of networks over which this download may proceed.
+                        request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE);
+                        //Set whether this download may proceed over a roaming connection.
+                        request.setAllowedOverRoaming(false);
+                        //Set the title of this download, to be displayed in notifications (if enabled).
+                        request.setTitle(activity.getString(R.string.download_installWithOptions_title));
+                        //Set a description of this download, to be displayed in notifications (if enabled)
+                        request.setDescription(activity.getString(R.string.downloading_file_description));
+                        //Set the local destination for the downloaded file to a path within the application's external files directory
+                        request.setDestinationInExternalPublicDir(DIRECTORY_DOWNLOADS, "InstallWithOptions.apk");
+                        //request.allowScanningByMediaScanner();
+                        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                        //Enqueue a new download and same the referenceId
+                        DownloadManager downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
+                        /*DownloadCompletedBroadcastReceiver.downloadReferenceInstallWithOptions =*/ downloadManager.enqueue(request);
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                    }
+                } else {
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse(PPApplication.INSTALL_WITH_OPTIONS_DOWNLOAD_URL));
+                    i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                    try {
+                        activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                    }
+                }
+            }
+        };
+        sbt.setSpan(clickableSpanText2, str1Text2.length()+1, str2Text2.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        text2.setText(sbt);
+        text2.setMovementMethod(LinkMovementMethod.getInstance());
+
+        TextView text3 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text3);
+        url = PPApplication.GITHUB_PPPPS_DOWNLOAD_URL;
+        /*dialogText = activity.getString(R.string.install_pppps_text15) + " " +
+                StringConstants.TAG_URL_LINK_START_HTML + url + StringConstants.TAG_URL_LINK_START_URL_END_HTML + url+ StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+StringConstants.TAG_URL_LINK_END_HTML +
+                StringConstants.TAG_BREAK_HTML;
+        text3.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));*/
+        CharSequence str1Text3 = activity.getString(R.string.install_pppps_text15);
+        CharSequence str2Text3 = str1Text3 + " " + url + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
+        sbt = new SpannableString(str2Text3);
+        sbt.setSpan(new StyleSpan(android.graphics.Typeface.NORMAL), 0, str1Text3.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        ClickableSpan clickableSpanText3 = new ClickableSpan() {
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setColor(ds.linkColor);    // you can use custom color
+                ds.setUnderlineText(false);    // this remove the underline
+            }
+
+            @Override
+            public void onClick(@NonNull View textView) {
+                if (PPApplication.deviceIsSamsung && PPApplication.romIsGalaxy) {
+                    // In One UI is bug in ststem downloader. Chrome, as default browser, do not downlaod
+                    // For this reason used is DownloadManager
+                    try {
+                        String text = activity.getString(R.string.downloading_toast_text);
+                        PPApplication.showToast(activity.getApplicationContext(), text, Toast.LENGTH_LONG);
+
+                        String url = PPApplication.GITHUB_PPPPS_DOWNLOAD_URL;
+                        Uri Download_Uri = Uri.parse(url);
+                        DownloadManager.Request request = new DownloadManager.Request(Download_Uri);
+
+                        //Restrict the types of networks over which this download may proceed.
+                        request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE);
+                        //Set whether this download may proceed over a roaming connection.
+                        request.setAllowedOverRoaming(false);
+                        //Set the title of this download, to be displayed in notifications (if enabled).
+                        request.setTitle(activity.getString(R.string.download_pppps_title));
+                        //Set a description of this download, to be displayed in notifications (if enabled)
+                        request.setDescription(activity.getString(R.string.downloading_file_description));
+                        //Set the local destination for the downloaded file to a path within the application's external files directory
+                        request.setDestinationInExternalPublicDir(DIRECTORY_DOWNLOADS, "PPPPutSettings.apk");
+                        //request.allowScanningByMediaScanner();
+                        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                        //Enqueue a new download and same the referenceId
+                        DownloadManager downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
+                        /*DownloadCompletedBroadcastReceiver.downloadReferencePPPPS =*/ downloadManager.enqueue(request);
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                    }
+                } else {
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse(PPApplication.GITHUB_PPPPS_DOWNLOAD_URL));
+                    i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                    try {
+                        activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    } catch (Exception e) {
+                        PPApplicationStatic.recordException(e);
+                    }
+                }
+            }
+        };
+        sbt.setSpan(clickableSpanText3, str1Text3.length()+1, str2Text3.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        text3.setText(sbt);
+        text3.setMovementMethod(LinkMovementMethod.getInstance());
+
+        TextView text4 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text4);
+        dialogText = activity.getString(R.string.install_pppps_text16);
+        text4.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
+
+        TextView text5 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text5);
+        dialogText = activity.getString(R.string.install_pppps_text17);
+        text5.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
+
+        TextView text6 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text6);
+        dialogText = activity.getString(R.string.install_pppps_text18);
+        text6.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
+
+        TextView text7 = layout.findViewById(R.id.install_pppps_from_github_dialog_info_text7);
+        dialogText =  StringConstants.TAG_BREAK_HTML + StringConstants.TAG_BOLD_START_HTML + activity.getString(R.string.install_pppps_text5) + StringConstants.TAG_BOLD_END_HTML+StringConstants.TAG_DOUBLE_BREAK_HTML;
+        dialogText = dialogText + activity.getString(R.string.install_pppps_text4);
+        dialogText = dialogText.replace(StringConstants.CHAR_NEW_LINE, StringConstants.TAG_BREAK_HTML);
+        text7.setText(StringFormatUtils.fromHtml(dialogText, false,  false, 0, 0, true));
+
+        //dialogBuilder.setCancelable(false);
+        /*dialogBuilder.setOnCancelListener(dialog -> {
+            if (finishActivity)
+                activity.finish();
+        });*/
+
+        dialogBuilder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+            if (finishActivity)
+                activity.finish();
+        });
+        /*dialogBuilder.setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+            if (finishActivity)
+                activity.finish();
+        });*/
+
+        final AlertDialog dialog = dialogBuilder.create();
+
+        TextView textGitHub = layout.findViewById(R.id.install_pppps_from_github_dialog_github_releases);
+        CharSequence str1GitHub = activity.getString(R.string.install_extender_github_releases);
+        CharSequence str2GitHub = str1GitHub + " " + PPApplication.GITHUB_PPPPS_RELEASES_URL + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW;
+        Spannable sbtGitHub = new SpannableString(str2GitHub);
+        sbtGitHub.setSpan(new StyleSpan(android.graphics.Typeface.NORMAL), 0, str1GitHub.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        ClickableSpan clickableSpanGitHub = new ClickableSpan() {
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setColor(ds.linkColor);    // you can use custom color
+                ds.setUnderlineText(false);    // this remove the underline
+            }
+
+            @Override
+            public void onClick(@NonNull View textView) {
+                String url = PPApplication.GITHUB_PPPPS_RELEASES_URL;
+                Intent i = new Intent(Intent.ACTION_VIEW);
+                i.setData(Uri.parse(url));
+                try {
+                    dialog.cancel();
+                    //if (activity != null)
+                    activity.startActivity(Intent.createChooser(i, activity.getString(R.string.web_browser_chooser)));
+                    if ((_preference != null) && (_preference.fragment != null))
+                        _preference.fragment.dismiss();
+                    if (finishActivity)
+                        activity.finish();
+                } catch (Exception e) {
+                    PPApplicationStatic.recordException(e);
+                    if ((_preference != null) && (_preference.fragment != null))
+                        _preference.fragment.dismiss();
+                    if (finishActivity)
+                        activity.finish();
+                }
+            }
+        };
+        sbtGitHub.setSpan(clickableSpanGitHub, str1GitHub.length()+1, str2GitHub.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        textGitHub.setText(sbtGitHub);
+        textGitHub.setMovementMethod(LinkMovementMethod.getInstance());
+
 //        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
 //            @Override
 //            public void onShow(DialogInterface dialog) {
@@ -375,12 +610,14 @@ static void installPPPPutSettings(final Activity activity,
         boolean fdroidInstalled = (_intent != null);
         _intent = packageManager.getLaunchIntentForPackage(PPApplication.DROIDIFY_PACKAGE_NAME);
         boolean droidifyInstalled = (_intent != null);
+        _intent = packageManager.getLaunchIntentForPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+        boolean neostoreInstalled = (_intent != null);
 
         if (Build.VERSION.SDK_INT < 34) {
-            // for Android 14+ is required to use adb command for PPPPutSettings installation,
-            // because target sdk is 22.
+            // for Android 14+ is required to use adb command or InstallWithOptions for
+            // PPPPutSettings installation, because target sdk is 22.
 
-            if (droidifyInstalled || fdroidInstalled) {
+            if (droidifyInstalled || neostoreInstalled || fdroidInstalled) {
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
                 dialogBuilder.setTitle(R.string.install_pppps_dialog_title);
 
@@ -460,6 +697,23 @@ public void onClick(@NonNull View textView) {
                             if (finishActivity)
                                 activity.finish();
                         }
+                    } else if (neostoreInstalled) {
+                        Intent intent = new Intent(Intent.ACTION_VIEW,
+                                Uri.parse("market://details?id=sk.henrichg.pppputsettings"));
+                        intent.setPackage(PPApplication.NEOSTORE_PACKAGE_NAME);
+                        try {
+                            activity.startActivity(intent);
+                            if ((_preference != null) && (_preference.fragment != null))
+                                _preference.fragment.dismiss();
+                            if (finishActivity)
+                                activity.finish();
+                        } catch (Exception e) {
+                            PPApplicationStatic.recordException(e);
+                            if ((_preference != null) && (_preference.fragment != null))
+                                _preference.fragment.dismiss();
+                            if (finishActivity)
+                                activity.finish();
+                        }
                     } else {
                         Intent intent = new Intent(Intent.ACTION_VIEW,
                                 Uri.parse("market://details?id=sk.henrichg.pppputsettings"));
@@ -511,7 +765,7 @@ public void onClick(@NonNull View textView) {
             } else
                 installPPPPutSettingsFromGitHub(activity, _preference, finishActivity);
         } else
-            installPPPPutSettingsFromGitHub(activity, _preference, finishActivity);
+            installPPPPutSettingsFromGitHub34(activity, _preference, finishActivity);
     }
 
     private void launchPPPPutSettings() {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPTileService.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPTileService.java
index 2cdb836059..cb1aa3554f 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPTileService.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PPTileService.java
@@ -88,7 +88,7 @@ public void onTileRemoved () {
         Runnable runnable = () -> {
 //                    PPApplicationStatic.logE("[IN_EXECUTOR] PPApplication.startHandlerThread", "START run - from=PPTileService.onTileRemoved");
 
-            DataWrapperStatic.setDynamicLauncherShortcuts(appContext);
+            DataWrapperStatic.setDynamicLauncherShortcuts(appContext, false);
         };
         PPApplicationStatic.createDelayedGuiExecutor();
         PPApplication.delayedGuiExecutor.submit(runnable);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PackageReplacedReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PackageReplacedReceiver.java
index cbb0a9bd08..5f318befb4 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PackageReplacedReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PackageReplacedReceiver.java
@@ -59,6 +59,7 @@ public void onReceive(Context context, Intent intent) {
                                 serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
                                 serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
                                 serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, true);
+                                serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //                                PPApplicationStatic.logE("[START_PP_SERVICE] PackageReplacedReceiver.onReceive", "xxx");
                                 PPApplicationStatic.startPPService(appContext, serviceIntent, true);
                             } catch (Exception e) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Permissions.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Permissions.java
index 54eefeeb88..2f127ce72d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Permissions.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Permissions.java
@@ -176,6 +176,10 @@ class Permissions {
     private static final String PREF_WRITE_STORAGE_PERMISSION = "writeStoragePermission";
     //private static final String PREF_CALL_LOGS_PERMISSION = "callLogsPermission";
 
+    private Permissions() {
+        // private constructor to prevent instantiation
+    }
+
     static boolean hasPermission(Context context, String permission) {
         return context.checkPermission(permission, PPApplication.pid, PPApplication.uid) == PackageManager.PERMISSION_GRANTED;
     }
@@ -1347,13 +1351,11 @@ static boolean checkEventSMSBroadcast(Context context, Event event, ArrayList<Pe
 
     static boolean checkLocation(Context context) {
         try {
-            if (Build.VERSION.SDK_INT >= 29) {
-
+            if (Build.VERSION.SDK_INT >= 29)
                 return (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) &&
                         (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) &&
                         (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED)
                         ;
-            }
             else
                 return (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) &&
                         (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED)
@@ -1373,6 +1375,7 @@ static private void checkEventLocation(Context context, Event event, SharedPrefe
                 //noinspection DuplicateExpressions
                 if ((sensorType == EventsHandler.SENSOR_TYPE_ALL) ||
                         (sensorType == EventsHandler.SENSOR_TYPE_WIFI_SCANNER) ||
+//                        (sensorType == EventsHandler.SENSOR_TYPE_WIFI_CONNECTION) ||
                         (sensorType == EventsHandler.SENSOR_TYPE_BLUETOOTH_SCANNER) ||
                         (sensorType == EventsHandler.SENSOR_TYPE_MOBILE_CELLS) ||
                         (sensorType == EventsHandler.SENSOR_TYPE_TIME) ||
@@ -1384,9 +1387,13 @@ static private void checkEventLocation(Context context, Event event, SharedPrefe
                     if (Build.VERSION.SDK_INT >= 29)
                         grantedAccessBackgroundLocation = ContextCompat.checkSelfPermission(context, permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
 
-                    if ((sensorType == EventsHandler.SENSOR_TYPE_ALL) || (sensorType == EventsHandler.SENSOR_TYPE_WIFI_SCANNER)) {
+                    if ((sensorType == EventsHandler.SENSOR_TYPE_ALL) ||
+                            (sensorType == EventsHandler.SENSOR_TYPE_WIFI_SCANNER) /*||
+                            (sensorType == EventsHandler.SENSOR_TYPE_WIFI_CONNECTION)*/) {
                         if ((event._eventPreferencesWifi._enabled &&
-                            ((event._eventPreferencesWifi._connectionType == EventPreferencesWifi.CTYPE_NEARBY) ||
+                            (/*(event._eventPreferencesWifi._connectionType == EventPreferencesWifi.CTYPE_CONNECTED) ||
+                             (event._eventPreferencesWifi._connectionType == EventPreferencesWifi.CTYPE_NOT_CONNECTED) ||*/
+                             (event._eventPreferencesWifi._connectionType == EventPreferencesWifi.CTYPE_NEARBY) ||
                              (event._eventPreferencesWifi._connectionType == EventPreferencesWifi.CTYPE_NOT_NEARBY)))) {
                             if (permissions != null) {
                                 if (!grantedAccessFineLocation)
@@ -1776,12 +1783,13 @@ static boolean checkMicrophone(Context context) {
         }
     }
 
+    /** @noinspection SameReturnValue*/
     static boolean checkSensors(/*Context context*/) {
-        try {
+        //try {
             return true;
-        } catch (Exception e) {
-            return false;
-        }
+        //} catch (Exception e) {
+        //    return false;
+        //}
     }
 
     /*
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesDashClockExtension.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesDashClockExtension.java
index 87cd92393f..c1e40200b3 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesDashClockExtension.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesDashClockExtension.java
@@ -89,6 +89,7 @@ protected void onUpdateData(int reason) {
 
                 if ((instance != null) && (instance.dataWrapper != null)) {
 
+                    //noinspection ExtractMethodRecommender
                     try {
 //                    PPApplicationStatic.logE("[IN_EXECUTOR] PhoneProfilesDashClockExtension.onUpdateData", "do it");
 
@@ -119,10 +120,13 @@ protected void onUpdateData(int reason) {
                             //iconResource = getResources().getIdentifier(Profile.PROFILE_ICON_DEFAULT, "drawable", PPApplication.PACKAGE_NAME);
                             iconResource = ProfileStatic.getIconResource(StringConstants.PROFILE_ICON_DEFAULT);
 
-                        /////////////////////////////////////////////////////////////
-
                         // intent
-                        Intent intent = GlobalGUIRoutines.getIntentForStartupSource(this, PPApplication.STARTUP_SOURCE_WIDGET);
+                        //Intent intent = GlobalGUIRoutines.getIntentForStartupSource(this, PPApplication.STARTUP_SOURCE_WIDGET);
+                        Intent intent;
+                        if (ApplicationPreferences.applicationWidgetDashClockLauncher.equals(StringConstants.EXTRA_ACTIVATOR))
+                            intent = new Intent(this.getApplicationContext(), ActivatorActivity.class);
+                        else
+                            intent = new Intent(this.getApplicationContext(), EditorActivity.class);
                         // clear all opened activities
                         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
                         intent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_WIDGET);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsActivity.java
index 91c09759d3..e02b8a0158 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsActivity.java
@@ -363,6 +363,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] PhoneProfilesPrefsActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             //return true;
@@ -547,7 +548,7 @@ private void doPreferenceChanges() {
             // PPApplicationStatic.recordException(e);
         //}
 
-        DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(appContext);
+        DataWrapperStatic.setDynamicLauncherShortcutsFromMainThread(appContext, false);
 
         /*
         if (PhoneProfilesService.getInstance() != null) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsAppNotification.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsAppNotification.java
index e3e9758ff9..dffc9cdf23 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsAppNotification.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsAppNotification.java
@@ -22,6 +22,7 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
 
     @Override
     void updateSharedPreferences(SharedPreferences.Editor editor, SharedPreferences fromPreference) {
+        editor.putString(ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER_DEFAULT_VALUE));
         editor.putString(ApplicationPreferences.PREF_NOTIFICATION_STATUS_BAR_STYLE, fromPreference.getString(ApplicationPreferences.PREF_NOTIFICATION_STATUS_BAR_STYLE, ApplicationPreferences.notificationStatusBarStyleDefaultValue()));
         editor.putString(ApplicationPreferences.PREF_NOTIFICATION_NOTIFICATION_STYLE, fromPreference.getString(ApplicationPreferences.PREF_NOTIFICATION_NOTIFICATION_STYLE, ApplicationPreferences.notificationNotificationStyleDefaultValue()));
         editor.putString(ApplicationPreferences.PREF_NOTIFICATION_LAYOUT_TYPE, fromPreference.getString(ApplicationPreferences.PREF_NOTIFICATION_LAYOUT_TYPE, ApplicationPreferences.PREF_NOTIFICATION_LAYOUT_TYPE_DEFAULT_VALUE));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsFragment.java
index affe2121b4..96730fce79 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsFragment.java
@@ -24,9 +24,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.ShortcutInfoCompat;
@@ -134,6 +136,7 @@ class PhoneProfilesPrefsFragment extends PreferenceFragmentCompat
     static final String PREF_PROFILE_LIST_NOTIFICATIONLIST_CATEGORY_ROOT = "categoryProfileListNotificationRoot";
     static final String PREF_SHORTCUT_CATEGORY_ROOT = "categoryShortcutRoot";
     static final String PREF_SAMSUNG_EDGE_PANEL_CATEGORY_ROOT = "categorySamsungEdgePanelRoot";
+    static final String PREF_WIDGET_DASH_CLOCK_CATEGORY_ROOT = "categoryWidgetDashClockRoot";
 
     static final String PREF_UNLINK_RINGER_NOTIFICATION_VOLUMES_INFO = "applicationUnlinkRingerNotificationVolumesInfo";
     static final String PREF_EVENT_PERIODIC_SCANNING_SCAN_INTERVAL_INFO = "applicationEventPeriodicScanningScanIntervalInfo";
@@ -172,6 +175,8 @@ class PhoneProfilesPrefsFragment extends PreferenceFragmentCompat
     static final String PREF_WIDGET_ONE_ROW_PROFILE_LIST_CATEGORY = "categoryWidgetOneRowProfileList";
     static final String PREF_APPLICATION_EVENT_MOBILE_CELL_CONFIGURE_CELLS = "applicationEventMobileCellsConfigureCells";
 
+    private static final String PREF_APPLICATION_WIDGET_DASH_CLOCK_INFO = "applicationWidgetDashClockInfo";
+
     //static final String PREF_POWER_SAVE_MODE_INTERNAL = "applicationPowerSaveModeInternal";
 
     private static final String ACTION_SHORTCUT_TO_EDITOR_ADDED = PPApplication.PACKAGE_NAME + ".ACTION_SHORTCUT_TO_EDITOR_ADDED";
@@ -383,6 +388,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
         if (getActivity() == null)
             return;
 
+        Context appContext = getActivity().getApplicationContext();
+
         PhoneProfilesPrefsActivity activity = (PhoneProfilesPrefsActivity) getActivity();
         if (!(activity.activityStarted))
             return;
@@ -498,6 +505,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
             if (preferenceCategoryScreen != null) setCategorySummary(preferenceCategoryScreen);
             preferenceCategoryScreen = findPreference(PREF_PROFILE_LIST_NOTIFICATIONLIST_CATEGORY_ROOT);
             if (preferenceCategoryScreen != null) setCategorySummary(preferenceCategoryScreen);
+            preferenceCategoryScreen = findPreference(PREF_WIDGET_DASH_CLOCK_CATEGORY_ROOT);
+            if (preferenceCategoryScreen != null) setCategorySummary(preferenceCategoryScreen);
 
             preferenceCategoryScreen = findPreference(PREF_SHORTCUT_CATEGORY_ROOT);
             if (preferenceCategoryScreen != null) setCategorySummary(preferenceCategoryScreen);
@@ -1562,14 +1571,14 @@ public boolean onPreferenceClick(Preference preference) {
                 });
             }
 */
-
+/*
         preference = findPreference(ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER);
         if (preference != null) {
             preference.setTitle(getString(R.string.phone_profiles_pref_applicationWidgetLauncher) +
                                     " (" + getString(R.string.widget_label_icon) +
                                     ", " + getString(R.string.widget_label_one_row) + ")");
         }
-
+*/
         /*if (Build.VERSION.SDK_INT < 29) {
             ListPreference listPreference = findPreference(ApplicationPreferences.PREF_NOTIFICATION_BACKGROUND_COLOR);
             if (listPreference != null) {
@@ -1926,7 +1935,7 @@ public boolean onPreferenceClick(Preference preference) {
 
         preference = prefMng.findPreference(PREF_CREATE_EDITOR_SHORTCUT);
         if (preference != null) {
-            Context appContext = getActivity().getApplicationContext();
+            //Context appContext = getActivity().getApplicationContext();
             if (ShortcutManagerCompat.isRequestPinShortcutSupported(appContext)) {
 
                 List<ShortcutInfoCompat> shortcuts = ShortcutManagerCompat.getShortcuts(appContext, ShortcutManagerCompat.FLAG_MATCH_PINNED);
@@ -1944,33 +1953,56 @@ public boolean onPreferenceClick(Preference preference) {
                         int receiverFlags = 0;
                         if (Build.VERSION.SDK_INT >= 34)
                             receiverFlags = RECEIVER_NOT_EXPORTED;
-                        getActivity().registerReceiver(shortcutToEditorAddedReceiver, shortcutAddedFilter, receiverFlags);
+                        appContext.registerReceiver(shortcutToEditorAddedReceiver, shortcutAddedFilter, receiverFlags);
                     }
 
                     preference.setVisible(true);
                     preference.setOnPreferenceClickListener(preference120 -> {
-                        Intent shortcutIntent = new Intent(appContext, EditorActivity.class);
-                        shortcutIntent.setAction(Intent.ACTION_MAIN);
-                        shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-                        ShortcutInfoCompat.Builder shortcutBuilderCompat = new ShortcutInfoCompat.Builder(appContext, SHORTCUT_ID_EDITOR);
-                        shortcutBuilderCompat.setIntent(shortcutIntent);
-                        shortcutBuilderCompat.setShortLabel(getString(R.string.editor_launcher_label));
-                        shortcutBuilderCompat.setLongLabel(getString(R.string.editor_launcher_label));
-                        shortcutBuilderCompat.setIcon(IconCompat.createWithResource(appContext, R.mipmap.ic_editor));
+                        PPEditTextAlertDialog editTextDialog = new PPEditTextAlertDialog(
+                                getString(R.string.shortcut_to_editor_dialog_title),
+                                getString(R.string.shortcut_to_dialog_lablel),
+                                getString(R.string.editor_launcher_label),
+                                getString(R.string.shortcut_to_dialog_create_button),
+                                getString(android.R.string.cancel),
+                                (dialog1, which) -> {
+                                    String iconName = "";
+                                    AlertDialog dialog = (AlertDialog) dialog1;
+                                    EditText editText = dialog.findViewById(R.id.dialog_with_edittext_edit);
+                                    if (editText != null)
+                                        iconName = editText.getText().toString();
+                                    if (iconName.isEmpty())
+                                        iconName = getString(R.string.editor_launcher_label);
+                                    //Log.e("PhoneProfilesPrefsFragment createEditorShortcut", "iconName="+iconName);
+
+                                    Intent shortcutIntent = new Intent(appContext, EditorActivity.class);
+                                    shortcutIntent.setAction(Intent.ACTION_MAIN);
+                                    shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+                                    ShortcutInfoCompat.Builder shortcutBuilderCompat = new ShortcutInfoCompat.Builder(appContext, SHORTCUT_ID_EDITOR);
+                                    shortcutBuilderCompat.setIntent(shortcutIntent);
+                                    shortcutBuilderCompat.setShortLabel(iconName);
+                                    shortcutBuilderCompat.setLongLabel(getString(R.string.editor_launcher_label));
+                                    shortcutBuilderCompat.setIcon(IconCompat.createWithResource(appContext, R.mipmap.ic_editor));
 
-                        try {
-                            Intent pinnedShortcutCallbackIntent = new Intent(ACTION_SHORTCUT_TO_EDITOR_ADDED);
-                            PendingIntent successCallback = PendingIntent.getBroadcast(appContext, 10, pinnedShortcutCallbackIntent,  0);
+                                    try {
+                                        Intent pinnedShortcutCallbackIntent = new Intent(ACTION_SHORTCUT_TO_EDITOR_ADDED);
+                                        PendingIntent successCallback = PendingIntent.getBroadcast(appContext, 10, pinnedShortcutCallbackIntent, 0);
 
-                            ShortcutInfoCompat shortcutInfo = shortcutBuilderCompat.build();
-                            ShortcutManagerCompat.requestPinShortcut(appContext, shortcutInfo, successCallback.getIntentSender());
-                            //fragment.getActivity().setResult(Activity.RESULT_OK, intent);
-                        } catch (Exception e) {
-                            // show dialog about this crash
-                            // for Microsft laucher it is:
-                            // java.lang.IllegalArgumentException ... already exists but disabled
-                        }
+                                        ShortcutInfoCompat shortcutInfo = shortcutBuilderCompat.build();
+                                        ShortcutManagerCompat.requestPinShortcut(appContext, shortcutInfo, successCallback.getIntentSender());
+                                        //fragment.getActivity().setResult(Activity.RESULT_OK, intent);
+                                    } catch (Exception e) {
+                                        // show dialog about this crash
+                                        // for Microsft laucher it is:
+                                        // java.lang.IllegalArgumentException ... already exists but disabled
+                                    }
+                                },
+                                null, null,
+                                true, true, false,
+                                activity
+                        );
+                        if (!activity.isFinishing())
+                            editTextDialog.show();
 
                         return false;
                     });
@@ -2010,7 +2042,7 @@ public boolean onPreferenceClick(Preference preference) {
 
         preference = prefMng.findPreference(PREF_CREATE_MOBILE_CELL_SCANNING_SHORTCUT);
         if (preference != null) {
-            Context appContext = getActivity().getApplicationContext();
+            //Context appContext = getActivity().getApplicationContext();
             if (ShortcutManagerCompat.isRequestPinShortcutSupported(appContext)) {
 
                 List<ShortcutInfoCompat> shortcuts = ShortcutManagerCompat.getShortcuts(appContext, ShortcutManagerCompat.FLAG_MATCH_PINNED);
@@ -2028,33 +2060,56 @@ public boolean onPreferenceClick(Preference preference) {
                         int receiverFlags = 0;
                         if (Build.VERSION.SDK_INT >= 34)
                             receiverFlags = RECEIVER_NOT_EXPORTED;
-                        getActivity().registerReceiver(shortcutToMobileCellScanningAddedReceiver, shortcutAddedFilter, receiverFlags);
+                        appContext.registerReceiver(shortcutToMobileCellScanningAddedReceiver, shortcutAddedFilter, receiverFlags);
                     }
 
                     preference.setVisible(true);
                     preference.setOnPreferenceClickListener(preference120 -> {
-                        Intent shortcutIntent = new Intent(appContext, LaunchMobileCellsScanningActivity.class);
-                        shortcutIntent.setAction(Intent.ACTION_MAIN);
-                        shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-                        ShortcutInfoCompat.Builder shortcutBuilderCompat = new ShortcutInfoCompat.Builder(appContext, SHORTCUT_ID_MOBILE_CELL_SCANNING);
-                        shortcutBuilderCompat.setIntent(shortcutIntent);
-                        shortcutBuilderCompat.setShortLabel(getString(R.string.phone_profiles_pref_category_mobile_cells_scanning));
-                        shortcutBuilderCompat.setLongLabel(getString(R.string.phone_profiles_pref_category_mobile_cells_scanning));
-                        shortcutBuilderCompat.setIcon(IconCompat.createWithResource(appContext, R.mipmap.ic_mobile_cell_scanning));
+                        PPEditTextAlertDialog editTextDialog = new PPEditTextAlertDialog(
+                                getString(R.string.shortcut_to_mobile_cells_scanning_dialog_title),
+                                getString(R.string.shortcut_to_dialog_lablel),
+                                getString(R.string.mobile_cells_scanning_short_shortcut_name),
+                                getString(R.string.shortcut_to_dialog_create_button),
+                                getString(android.R.string.cancel),
+                                (dialog1, which) -> {
+                                    String iconName = "";
+                                    AlertDialog dialog = (AlertDialog) dialog1;
+                                    EditText editText = dialog.findViewById(R.id.dialog_with_edittext_edit);
+                                    if (editText != null)
+                                        iconName = editText.getText().toString();
+                                    if (iconName.isEmpty())
+                                        iconName = getString(R.string.mobile_cells_scanning_short_shortcut_name);
+                                    //Log.e("PhoneProfilesPrefsFragment createEditorShortcut", "iconName="+iconName);
+
+                                    Intent shortcutIntent = new Intent(appContext, LaunchMobileCellsScanningActivity.class);
+                                    shortcutIntent.setAction(Intent.ACTION_MAIN);
+                                    shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+                                    ShortcutInfoCompat.Builder shortcutBuilderCompat = new ShortcutInfoCompat.Builder(appContext, SHORTCUT_ID_MOBILE_CELL_SCANNING);
+                                    shortcutBuilderCompat.setIntent(shortcutIntent);
+                                    shortcutBuilderCompat.setShortLabel(iconName);
+                                    shortcutBuilderCompat.setLongLabel(getString(R.string.phone_profiles_pref_category_mobile_cells_scanning));
+                                    shortcutBuilderCompat.setIcon(IconCompat.createWithResource(appContext, R.mipmap.ic_mobile_cell_scanning));
 
-                        try {
-                            Intent pinnedShortcutCallbackIntent = new Intent(ACTION_SHORTCUT_TO_MOBILE_CELL_SCANNING_ADDED);
-                            PendingIntent successCallback = PendingIntent.getBroadcast(appContext, 10, pinnedShortcutCallbackIntent,  0);
+                                    try {
+                                        Intent pinnedShortcutCallbackIntent = new Intent(ACTION_SHORTCUT_TO_MOBILE_CELL_SCANNING_ADDED);
+                                        PendingIntent successCallback = PendingIntent.getBroadcast(appContext, 10, pinnedShortcutCallbackIntent,  0);
 
-                            ShortcutInfoCompat shortcutInfo = shortcutBuilderCompat.build();
-                            ShortcutManagerCompat.requestPinShortcut(appContext, shortcutInfo, successCallback.getIntentSender());
-                            //fragment.getActivity().setResult(Activity.RESULT_OK, intent);
-                        } catch (Exception e) {
-                            // show dialog about this crash
-                            // for Microsft laucher it is:
-                            // java.lang.IllegalArgumentException ... already exists but disabled
-                        }
+                                        ShortcutInfoCompat shortcutInfo = shortcutBuilderCompat.build();
+                                        ShortcutManagerCompat.requestPinShortcut(appContext, shortcutInfo, successCallback.getIntentSender());
+                                        //fragment.getActivity().setResult(Activity.RESULT_OK, intent);
+                                    } catch (Exception e) {
+                                        // show dialog about this crash
+                                        // for Microsft laucher it is:
+                                        // java.lang.IllegalArgumentException ... already exists but disabled
+                                    }
+                                },
+                                null, null,
+                                true, true, false,
+                                activity
+                        );
+                        if (!activity.isFinishing())
+                            editTextDialog.show();
 
                         return false;
                     });
@@ -2065,6 +2120,33 @@ public boolean onPreferenceClick(Preference preference) {
                 preference.setVisible(false);
         }
 
+        InfoDialogPreference infoDialogPreference = prefMng.findPreference(PREF_APPLICATION_WIDGET_DASH_CLOCK_INFO);
+        if (infoDialogPreference != null) {
+
+            final String dashClockGitHub = "https://github.com/romannurik/dashclock";
+            final String dashClockAPKMirror = "https://www.apkmirror.com/apk/roman-nurik-and-ian-lake/dashclock-widget/";
+            infoDialogPreference.setInfoText(
+                    getString(R.string.dash_clock_widget_info_1)  + StringConstants.TAG_DOUBLE_BREAK_HTML +
+                            // <ul><li>
+                            StringConstants.TAG_LIST_START_FIRST_ITEM_HTML +
+                            getString(R.string.dash_clock_widget_info_2) + StringConstants.TAG_BREAK_HTML +
+                            StringConstants.TAG_URL_LINK_START_HTML + dashClockGitHub + StringConstants.TAG_URL_LINK_START_URL_END_HTML +
+                            dashClockGitHub + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+
+                            StringConstants.TAG_URL_LINK_END_HTML+StringConstants.TAG_DOUBLE_BREAK_HTML +
+                            //</li>
+                            StringConstants.TAG_LIST_ITEM_END_HTML +
+                            //<li>
+                            StringConstants.TAG_LIST_ITEM_START_HTML +
+                            getString(R.string.dash_clock_widget_info_3) + StringConstants.TAG_BREAK_HTML +
+                            StringConstants.TAG_URL_LINK_START_HTML + dashClockAPKMirror + StringConstants.TAG_URL_LINK_START_URL_END_HTML +
+                            dashClockAPKMirror + StringConstants.STR_HARD_SPACE_DOUBLE_ARROW_HTML+
+                            StringConstants.TAG_URL_LINK_END_HTML+StringConstants.TAG_DOUBLE_BREAK_HTML +
+                            //</li></ul>
+                            StringConstants.TAG_LIST_END_LAST_ITEM_HTML
+            );
+            infoDialogPreference.setIsHtml(true);
+        }
+
     }
 
     private void doOnActivityCreatedBatterySaver(String key) {
@@ -3159,14 +3241,15 @@ private void setEnabledWidgets(String key) {
         if (key.equals(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_PREF_INDICATOR) || keyIsWidgetListChangeColorByNightMode) {
             Preference _preference = prefMng.findPreference(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_PREF_INDICATOR_LIGHTNESS);
             if (_preference != null) {
-                if (changeWidgetListColorsByNightMode) {
+                _preference.setEnabled(preferenceIndicatorsListEnabled);
+                /*if (changeWidgetListColorsByNightMode) {
                     //if (useDynamicColorsWidgetList)
                     //    _preference.setEnabled(false);
                     //else
                         _preference.setEnabled(preferenceIndicatorsListEnabled);
                 } else {
                     _preference.setEnabled(preferenceIndicatorsListEnabled);
-                }
+                }*/
             }
         }
         //if (key.equals(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_ROUNDED_CORNERS)) {
@@ -3177,14 +3260,15 @@ private void setEnabledWidgets(String key) {
         if (key.equals(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_PREF_INDICATOR) || keyIsWidgetOneRowChangeColorByNightMode) {
             Preference _preference = prefMng.findPreference(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_PREF_INDICATOR_LIGHTNESS);
             if (_preference != null) {
-                if (changeWidgetOneRowColorsByNightMode) {
+                _preference.setEnabled(preferenceIndicatorsOneRowEnabled);
+                /*if (changeWidgetOneRowColorsByNightMode) {
                     //if (useDynamicColorsWidgetOneRow)
                     //    _preference.setEnabled(false);
                     //else
                         _preference.setEnabled(preferenceIndicatorsOneRowEnabled);
                 } else {
                     _preference.setEnabled(preferenceIndicatorsOneRowEnabled);
-                }
+                }*/
             }
         }
         //if (key.equals(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_ROUNDED_CORNERS)) {
@@ -3286,14 +3370,15 @@ private void setEnabledWidgets(String key) {
                 _preference.setEnabled(changeWidgetOneRowColorsByNightMode && (!useDynamicColorsWidgetOneRow));
             _preference = prefMng.findPreference(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_PREF_INDICATOR_LIGHTNESS);
             if (_preference != null) {
-                if (changeWidgetOneRowColorsByNightMode) {
+                _preference.setEnabled(preferenceIndicatorsOneRowEnabled);
+                /*if (changeWidgetOneRowColorsByNightMode) {
                     //if (useDynamicColorsWidgetOneRow)
                     //    _preference.setEnabled(false);
                     //else
                         _preference.setEnabled(preferenceIndicatorsOneRowEnabled);
                 } else {
                     _preference.setEnabled(preferenceIndicatorsOneRowEnabled);
-                }
+                }*/
             }
         }
         if (key.equals(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_BACKGROUND_COLOR_NIGHT_MODE_ON) ||
@@ -3309,14 +3394,15 @@ private void setEnabledWidgets(String key) {
                 _preference.setEnabled(changeWidgetListColorsByNightMode && (!useDynamicColorsWidgetList));
             _preference = prefMng.findPreference(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_PREF_INDICATOR_LIGHTNESS);
             if (_preference != null) {
-                if (changeWidgetListColorsByNightMode) {
+                _preference.setEnabled(preferenceIndicatorsListEnabled);
+                /*if (changeWidgetListColorsByNightMode) {
                     //if (useDynamicColorsWidgetList)
                     //    _preference.setEnabled(false);
                     //else
                         _preference.setEnabled(preferenceIndicatorsListEnabled);
                 } else {
                     _preference.setEnabled(preferenceIndicatorsListEnabled);
-                }
+                }*/
             }
         }
         if (key.equals(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_PROFILE_LIST_BACKGROUND_COLOR_NIGHT_MODE_ON) ||
@@ -3799,7 +3885,11 @@ private void setSummary(String key) {
             preference.setSummary(summary);
         }
         if (key.equals(PREF_WIFI_LOCATION_SYSTEM_SETTINGS)) {
-            String summary = getString(R.string.phone_profiles_pref_eventWiFiLocationSystemSettings_summary);
+            String summary;
+            if (Build.VERSION.SDK_INT < 29)
+                summary = context.getString(R.string.phone_profiles_pref_eventWiFiLocationSystemSettings_summary);
+            else
+                summary = context.getString(R.string.phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29);
             if (!GlobalUtils.isLocationEnabled(context)) {
                 summary = getString(R.string.phone_profiles_pref_applicationEventScanningLocationSettingsDisabled_summary) + StringConstants.STR_DOUBLE_NEWLINE_WITH_DOT +
                         summary;
@@ -4015,10 +4105,14 @@ private void setCategorySummary(Preference preferenceCategory) {
         StringBuilder _value = new StringBuilder();
         if (key.equals(PREF_APPLICATION_INTERFACE_CATEGORY_ROOT)) {
             _value.append(getString(R.string.phone_profiles_pref_applicationTheme));
+            //_value.append(StringConstants.STR_BULLET);
+            //_value.append(getString(R.string.phone_profiles_pref_applicationWidgetLauncher));
+            //_value.append(StringConstants.STR_BULLET);
+            //_value.append(getString(R.string.phone_profiles_pref_notificationLauncher));
             _value.append(StringConstants.STR_BULLET);
-            _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLauncher));
+            _value.append(getString(R.string.phone_profiles_pref_applicationRestartEventsIconColor));
             _value.append(StringConstants.STR_BULLET);
-            _value.append(getString(R.string.phone_profiles_pref_notificationLauncher));
+            _value.append(getString(R.string.phone_profiles_pref_createEditorShortcut));
         }
         if (key.equals(PREF_APPLICATION_START_CATEGORY_ROOT)) {
             //_value.append(getString(R.string.phone_profiles_pref_applicationStartOnBoot));
@@ -4052,6 +4146,8 @@ private void setCategorySummary(Preference preferenceCategory) {
         if (key.equals(PREF_APP_NOTIFICATION_CATEGORY_ROOT)) {
             _value.append(getString(R.string.phone_profiles_pref_notificationSystemSettings));
             _value.append(StringConstants.STR_BULLET);
+            _value.append(getString(R.string.phone_profiles_pref_notificationLauncher));
+            _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_notificationStatusBarStyle));
             _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_notificationNotificationStyle));
@@ -4423,6 +4519,8 @@ private void setCategorySummary(Preference preferenceCategory) {
             _value.append(getString(R.string.phone_profiles_pref_deleteOldActivityLogs));
         }
         if (key.equals(PREF_WIDGET_LIST_CATEGORY_ROOT)) {
+            _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLauncher));
+            _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationPrefIndicator));
             _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationHeader));
@@ -4448,6 +4546,8 @@ private void setCategorySummary(Preference preferenceCategory) {
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLightnessI));
         }
         if (key.equals(PREF_WIDGET_ONE_ROW_CATEGORY_ROOT)) {
+            _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLauncher));
+            _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationPrefIndicator));
             _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetBackgroundType));
@@ -4469,6 +4569,8 @@ private void setCategorySummary(Preference preferenceCategory) {
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLightnessI));
         }
         if (key.equals(PREF_WIDGET_ICON_CATEGORY_ROOT)) {
+            _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLauncher));
+            _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetIconBackgroundType));
             _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetIconBackground));
@@ -4491,6 +4593,9 @@ private void setCategorySummary(Preference preferenceCategory) {
             _value.append(StringConstants.STR_BULLET);
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLightnessI));
         }
+        if (key.equals(PREF_WIDGET_DASH_CLOCK_CATEGORY_ROOT)) {
+            _value.append(getString(R.string.phone_profiles_pref_applicationWidgetLauncher));
+        }
         if (key.equals(PREF_WIDGET_ONE_ROW_PROFILE_LIST_CATEGORY_ROOT)) {
             _value.append(getString(R.string.phone_profiles_pref_applicationWidgetOneRowProfileListNumberOfProfilesPerPage));
             _value.append(StringConstants.STR_BULLET);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsInterface.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsInterface.java
index ef030ff30e..90b98d9c90 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsInterface.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsInterface.java
@@ -24,8 +24,8 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
     void updateSharedPreferences(SharedPreferences.Editor editor, SharedPreferences fromPreference) {
         editor.putString(ApplicationPreferences.PREF_APPLICATION_THEME, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_THEME, ApplicationPreferences.applicationThemeDefaultValue()));
         //editor.putString(ApplicationPreferences.PREF_APPLICATION_HOME_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_HOME_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_HOME_LAUNCHER_DEFAULT_VALUE));
-        editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER_DEFAULT_VALUE));
-        editor.putString(ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER_DEFAULT_VALUE));
+        //editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER_DEFAULT_VALUE));
+        //editor.putString(ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_NOTIFICATION_LAUNCHER_DEFAULT_VALUE));
         editor.putString(ApplicationPreferences.PREF_APPLICATION_RESTART_EVENTS_ICON_COLOR, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_RESTART_EVENTS_ICON_COLOR, ApplicationPreferences.PREF_APPLICATION_RESTART_EVENTS_ICON_COLOR_DEFAULT_VALUE));
         //editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_INCREASE_BRIGHTNESS_FOR_PROFILE_ICON, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_INCREASE_BRIGHTNESS_FOR_PROFILE_ICON, ApplicationPreferences.PREF_APPLICATION_INCREASE_BRIGHTNESS_FOR_PROFILE_ICON_DEFAULT_VALUE));
     }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetDashClock.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetDashClock.java
new file mode 100644
index 0000000000..d601a5b992
--- /dev/null
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetDashClock.java
@@ -0,0 +1,28 @@
+package sk.henrichg.phoneprofilesplus;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+
+import androidx.preference.PreferenceManager;
+
+public class PhoneProfilesPrefsWidgetDashClock extends PhoneProfilesPrefsFragment {
+
+    @Override
+    public void onCreatePreferences(Bundle bundle, String rootKey) {
+        PreferenceManager prefMng = getPreferenceManager();
+        SharedPreferences preferences = prefMng.getSharedPreferences();
+        if ((getContext() != null) && (preferences != null)) {
+            SharedPreferences applicationPreferences = getContext().getApplicationContext().getSharedPreferences(PPApplication.APPLICATION_PREFS_NAME, Activity.MODE_PRIVATE);
+            loadSharedPreferences(preferences, applicationPreferences);
+        }
+
+        setPreferencesFromResource(R.xml.phone_profiles_prefs_widget_dash_clock, rootKey);
+    }
+
+    @Override
+    void updateSharedPreferences(SharedPreferences.Editor editor, SharedPreferences fromPreference) {
+        editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER_DEFAULT_VALUE));
+    }
+
+}
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetIcon.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetIcon.java
index e046c49e15..1eeae7ab27 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetIcon.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetIcon.java
@@ -22,6 +22,7 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
 
     @Override
     void updateSharedPreferences(SharedPreferences.Editor editor, SharedPreferences fromPreference) {
+        editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAUNCHER_DEFAULT_VALUE));
         editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAYOUT_HEIGHT, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAYOUT_HEIGHT, ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAYOUT_HEIGHT_DEFAULT_VALUE));
         editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_FILL_BACKGROUND, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_FILL_BACKGROUND, ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_FILL_BACKGROUND_DEFAULT_VALUE));
         editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_CHANGE_COLOR_BY_NIGHT_MODE, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_CHANGE_COLOR_BY_NIGHT_MODE, ApplicationPreferences.applicationWidgetIconChangeColorsByNightModeDefaultValue(getContext())));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetList.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetList.java
index 6f52881fee..f9bc7a47b3 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetList.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetList.java
@@ -22,6 +22,7 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
 
     @Override
     void updateSharedPreferences(SharedPreferences.Editor editor, SharedPreferences fromPreference) {
+        editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_LAUNCHER_DEFAULT_VALUE));
         editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_HEADER, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_HEADER, ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_HEADER_DEFAULT_VALUE));
         editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_GRID_LAYOUT, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_GRID_LAYOUT, ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_GRID_LAYOUT_DEFAULT_VALUE));
         editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_COMPACT_GRID, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_COMPACT_GRID, ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_COMPACT_GRID_DEFAULT_VALUE));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetOneRow.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetOneRow.java
index 978a03bccf..6b184d8565 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetOneRow.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesPrefsWidgetOneRow.java
@@ -22,6 +22,7 @@ public void onCreatePreferences(Bundle bundle, String rootKey) {
 
     @Override
     void updateSharedPreferences(SharedPreferences.Editor editor, SharedPreferences fromPreference) {
+        editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER, ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER_DEFAULT_VALUE));
         editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAYOUT_HEIGHT, fromPreference.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAYOUT_HEIGHT, ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAYOUT_HEIGHT_DEFAULT_VALUE));
         //editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_HIGHER_LAYOUT, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_HIGHER_LAYOUT, ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_HIGHER_LAYOUT_DEFAULT_VALUE));
         editor.putBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_FILL_BACKGROUND, fromPreference.getBoolean(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_FILL_BACKGROUND, ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_FILL_BACKGROUND_DEFAULT_VALUE));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesService.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesService.java
index 93ccb70d4e..61fff84e87 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesService.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesService.java
@@ -1,6 +1,7 @@
 package sk.henrichg.phoneprofilesplus;
 
 import android.annotation.SuppressLint;
+import android.app.DownloadManager;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -139,6 +140,8 @@ public class PhoneProfilesService extends Service
     static final String EXTRA_UNREGISTER_RECEIVERS_FOR_SMS_SENSOR = "unregister_receivers_for_sms_sensor";
     static final String EXTRA_DISABLE_NOT_USED_SCANNERS = "disable_not_used_scanners";
 
+    static final String EXTRA_START_FOR_SHIZUKU_START = "start_for_shizuku_start";
+
     //static final String EXTRA_SHOW_TOAST = "show_toast";
 
     static final int START_FOR_EXTERNAL_APP_PROFILE = 1;
@@ -156,7 +159,7 @@ public void onReceive(Context context, Intent intent) {
 
     private final Shizuku.OnBinderReceivedListener BINDER_RECEIVED_LISTENER = () -> {
         if (!Shizuku.isPreV11()) {
-//            Log.e("PhoneProfilesService.BINDER_RECEIVED_LISTENER", "xxx");
+            PPApplicationStatic.logE("PhoneProfilesService.BINDER_RECEIVED_LISTENER", "*** Shizuku started ***");
 
             RootUtils.initRoot();
 
@@ -168,6 +171,54 @@ public void onReceive(Context context, Intent intent) {
             RootUtils.getServicesList();
             ApplicationPreferences.applicationHyperOsWifiBluetoothDialogs(getApplicationContext());
             Permissions.setHyperOSWifiBluetoothDialogAppOp();
+
+            // do activate profile/restart events aso for first start
+            Data workData = new Data.Builder()
+                    .putBoolean(PhoneProfilesService.EXTRA_ACTIVATE_PROFILES, true)
+
+                    .putBoolean(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APPLICATION, false)
+                    .putString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_ACTION, "")
+                    .putInt(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_TYPE, 0)
+                    .putString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_VALUE, "")
+
+                    .putBoolean(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, true)
+
+                    //.putBoolean(PhoneProfilesService.EXTRA_SHOW_TOAST, serviceIntent != null)
+                    .build();
+
+//            PPApplicationStatic.logE("[MAIN_WORKER_CALL] PhoneProfilesService.doForFirstStart", "xxxxxxxxxxxxxxxxxxxx");
+
+            OneTimeWorkRequest worker =
+                    new OneTimeWorkRequest.Builder(MainWorker.class)
+                            .addTag(PPApplication.AFTER_SHIZUKU_START_WORK_TAG)
+                            .setInputData(workData)
+
+                            .setInitialDelay(10, TimeUnit.SECONDS)
+
+                            .keepResultsForAtLeast(PPApplication.WORK_PRUNE_DELAY_MINUTES, TimeUnit.MINUTES)
+                            .build();
+            try {
+                WorkManager workManager = PPApplication.getWorkManagerInstance();
+                if (workManager != null) {
+
+//                                        //if (PPApplicationStatic.logEnabled()) {
+//                                        ListenableFuture<List<WorkInfo>> statuses;
+//                                        statuses = workManager.getWorkInfosForUniqueWork(PPApplication.AFTER_FIRST_START_WORK_TAG);
+//                                        try {
+//                                            List<WorkInfo> workInfoList = statuses.get();
+//                                        } catch (Exception ignored) {
+//                                        }
+//                                        //}
+
+//                      PPApplicationStatic.logE("[WORKER_CALL] PhoneProfilesService.doFirstStart", "keepResultsForAtLeast");
+                    //workManager.enqueue(worker);
+                    // !!! MUST BE APPEND_OR_REPLACE FOR EXTRA_START_FOR_EXTERNAL_APPLICATION !!!
+                    workManager.enqueueUniqueWork(PPApplication.AFTER_SHIZUKU_START_WORK_TAG, ExistingWorkPolicy.REPLACE, worker);
+                }
+            } catch (Exception e) {
+                PPApplicationStatic.recordException(e);
+            }
+
         }
     };
 
@@ -246,6 +297,13 @@ public void onCreate() {
         Shizuku.addBinderReceivedListenerSticky(BINDER_RECEIVED_LISTENER);
         LocalBroadcastManager.getInstance(appContext).registerReceiver(commandReceiver, new IntentFilter(ACTION_COMMAND));
 
+        int downoladReceiverFlags = 0;
+        if (Build.VERSION.SDK_INT >= 34)
+            downoladReceiverFlags = RECEIVER_EXPORTED;  // !!! it must be exported for DownloadManager
+        appContext.registerReceiver(PPApplication.downloadCompletedBroadcastReceiver,
+                new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), downoladReceiverFlags);
+
+        /*
         if (Build.VERSION.SDK_INT < 31) {
             IntentFilter intentFilter5 = new IntentFilter();
             intentFilter5.addAction(PPAppNotification.ACTION_START_LAUNCHER_FROM_NOTIFICATION);
@@ -254,6 +312,7 @@ public void onCreate() {
             //    receiverFlags = RECEIVER_NOT_EXPORTED;
             appContext.registerReceiver(PPApplication.startLauncherFromNotificationReceiver, intentFilter5, receiverFlags);
         }
+        */
 
         //appContext.registerReceiver(PPApplication.showProfileNotificationBroadcastReceiver, new IntentFilter(PPApplication.ACTION_SHOW_PROFILE_NOTIFICATION));
         //appContext.registerReceiver(PPApplication.updateGUIBroadcastReceiver, new IntentFilter(PPApplication.ACTION_UPDATE_GUI));
@@ -385,11 +444,17 @@ public void onDestroy()
         PhoneProfilesServiceStatic.registerPPPExtenderReceiver(false, null, appContext);
         PhoneProfilesServiceStatic.unregisterEventsReceiversAndWorkers(true, appContext);
 
+        try {
+            appContext.unregisterReceiver(PPApplication.downloadCompletedBroadcastReceiver);
+        } catch (Exception ignored) {}
+
+        /*
         if (Build.VERSION.SDK_INT < 31) {
             try {
                 appContext.unregisterReceiver(PPApplication.startLauncherFromNotificationReceiver);
             } catch (Exception ignored) {}
         }
+        */
         try {
             LocalBroadcastManager.getInstance(appContext).unregisterReceiver(PPApplication.refreshActivitiesBroadcastReceiver);
         } catch (Exception ignored) {}
@@ -506,6 +571,7 @@ private void doForFirstStart(final Intent serviceIntent/*, int flags, int startI
 
         final Context appContext = getApplicationContext();
 
+        PPApplicationStatic.setApplicationStopping(getApplicationContext(), false);
         //final boolean oldServiceHasFirstStart = PPApplication.serviceHasFirstStart;
         serviceHasFirstStart = true;
         PPApplicationStatic.setApplicationStarted(getApplicationContext(), true);
@@ -681,12 +747,13 @@ private void doForFirstStart(final Intent serviceIntent/*, int flags, int startI
                     PPApplicationStatic.logE("PhoneProflesService.doForFirstStart - handler", "__activateProfiles=" + __activateProfiles);
                 }
 
+                // TODO remove for release
                 /*if (PPApplicationStatic.logEnabled()) {
-                    // get list of TRANSACTIONS for "phone"
-                    Object serviceManager = PPApplication.getServiceManager("phone");
+                    // get list of TRANSACTIONS
+                    Object serviceManager = RootUtils.getServiceManager("isub");
                     if (serviceManager != null) {
                         // only log it
-                        PPApplication.getTransactionCode(String.valueOf(serviceManager), "");
+                        RootUtils.getTransactionCode(String.valueOf(serviceManager), "");
                     }
                 }*/
 
@@ -724,7 +791,7 @@ private void doForFirstStart(final Intent serviceIntent/*, int flags, int startI
                 //GlobalGUIRoutines.setLanguage(appContext);
                 GlobalGUIRoutines.switchNightMode(appContext, true);
 
-                DataWrapperStatic.setDynamicLauncherShortcuts(appContext);
+                DataWrapperStatic.setDynamicLauncherShortcuts(appContext, false);
 
                 PPApplicationStatic.logE("PhoneProfilesService.doForFirstStart - handler", "application not started, start it");
 
@@ -1010,6 +1077,7 @@ private void doForFirstStart(final Intent serviceIntent/*, int flags, int startI
                             .putString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_ACTION, _startForExternalAppAction)
                             .putInt(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_TYPE, _startForExternalAppDataType)
                             .putString(PhoneProfilesService.EXTRA_START_FOR_EXTERNAL_APP_DATA_VALUE, _startForExternalAppDataValue)
+                            .putBoolean(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false)
                             //.putBoolean(PhoneProfilesService.EXTRA_SHOW_TOAST, serviceIntent != null)
                             .build();
 
@@ -1670,6 +1738,19 @@ private boolean doForPackageReplaced(Context appContext) {
                 }
                 */
 
+                if (actualVersionCode <= 7145) {
+                    SharedPreferences preferences = ApplicationPreferences.getSharedPreferences(appContext);
+
+                    String widgetLauncher = preferences.getString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER,
+                                                ApplicationPreferences.PREF_APPLICATION_WIDGET_LAUNCHER_DEFAULT_VALUE);
+                    SharedPreferences.Editor editor = preferences.edit();
+                    editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ICON_LAUNCHER, widgetLauncher);
+                    editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_ONE_ROW_LAUNCHER, widgetLauncher);
+                    editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_LIST_LAUNCHER, widgetLauncher);
+                    editor.putString(ApplicationPreferences.PREF_APPLICATION_WIDGET_DASH_CLOCK_LAUNCHER, widgetLauncher);
+                    editor.apply();
+                }
+
             }
 
             // Keep this !!! stop tap target for package replaced
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesServiceStatic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesServiceStatic.java
index 2654f4eb71..e131046c49 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesServiceStatic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PhoneProfilesServiceStatic.java
@@ -42,6 +42,10 @@
 class PhoneProfilesServiceStatic
 {
 
+    private PhoneProfilesServiceStatic() {
+        // private constructor to prevent instantiation
+    }
+
     static void registerAllTheTimeRequiredPPPBroadcastReceivers(boolean register, Context context) {
         final Context appContext = context.getApplicationContext();
         if (!register) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PlayRingingNotification.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PlayRingingNotification.java
index 8ae60717cd..47641d910c 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PlayRingingNotification.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PlayRingingNotification.java
@@ -107,15 +107,15 @@ static void doSimulatingRingingCall(Intent intent, Context context) {
                         break;
                 }
                 switch (ActivateProfileHelper.getSystemZenMode(context)) {
-                    case ActivateProfileHelper.ZENMODE_ALARMS:
+                    case ActivateProfileHelper.SYSTEM_ZENMODE_ALARMS:
                         newZenMode = Profile.ZENMODE_ALARMS;
 //                        PPApplicationStatic.logE("[RINGING_SIMULATION] PlayRingingNotification.doSimulatingRingingCall", "newZenMode=ALARMS");
                         break;
-                    case ActivateProfileHelper.ZENMODE_NONE:
+                    case ActivateProfileHelper.SYSTEM_ZENMODE_NONE:
                         newZenMode = Profile.ZENMODE_NONE;
 //                        PPApplicationStatic.logE("[RINGING_SIMULATION] PlayRingingNotification.doSimulatingRingingCall", "newZenMode=NONE");
                         break;
-                    case ActivateProfileHelper.ZENMODE_PRIORITY:
+                    case ActivateProfileHelper.SYSTEM_ZENMODE_PRIORITY:
                         newZenMode = Profile.ZENMODE_PRIORITY;
 //                        PPApplicationStatic.logE("[RINGING_SIMULATION] PlayRingingNotification.doSimulatingRingingCall", "newZenMode=PRIORITY");
                         break;
@@ -307,13 +307,17 @@ static void startSimulatingRingingCall(/*int stream,*/ String ringtone, int ring
             }
             // ----------
 
+            /*
             // do not simulate ringing when ring or stream is muted
+            // Wrong! Do not test actual mute state of ringing from system, tested must be _volumeMuteSound
+            // from activated profile (look at EventsHandler.doEndHandler())
             if (audioManager != null) {
                 if (audioManager.isStreamMute(AudioManager.STREAM_RING)) {
 //                    PPApplicationStatic.logE("[RINGING_SIMULATION] PlayRingingNotification.startSimulatingRingingCall", "stream_rin mutted");
                     return;
                 }
             }
+            */
 
 //            PPApplicationStatic.logE("[RINGING_SIMULATION] PlayRingingNotification.startSimulatingRingingCall", "stream_ring NOT muted");
 
@@ -790,6 +794,7 @@ static void stopPlayNotificationSound(boolean setBackMediaVolume, Context contex
             }
 
             if (setBackMediaVolume) {
+                //noinspection UnreachableCode
                 try {
                     if (PlayRingingNotification.notificationIsPlayed) {
                         if ((PlayRingingNotification.oldVolumeForPlayNotificationSound != -1) &&
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java
index 4723db931d..33ec5f187e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java
@@ -98,9 +98,6 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_AIRPLANE_MODE(Prefere
                         preferenceAllowed.allowed = PREFERENCE_ALLOWED;
                 } else
                     preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-            } else {
-                preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
-                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
             }
         }
         else
@@ -113,6 +110,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_AIRPLANE_MODE(Prefere
                     if (applicationNeverAskForGrantRoot) {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                        return;
                     }
                 }
             } else
@@ -626,6 +624,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_GPS(PreferenceAllowed
                             if (applicationNeverAskForGrantRoot) {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                return;
                             }
                         }
                     } else if (sharedPreferences != null) {
@@ -764,6 +763,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_NFC(PreferenceAllowed
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 }
@@ -837,11 +837,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_WIFI_AP(PreferenceAll
                                 } else {
                                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                                    return;
                                 }
                             } else {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                                 preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                                return;
                             }
 
                             boolean sim0Exists;
@@ -851,7 +853,6 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_WIFI_AP(PreferenceAll
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NO_SIM_CARD;
                             }
-
                         } else if (RootUtils.isRooted(/*fromUIThread*/)) {
                             // device is rooted
 
@@ -861,6 +862,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_WIFI_AP(PreferenceAll
                                     if (applicationNeverAskForGrantRoot) {
                                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                        return;
                                     }
                                 }
                             } else if (sharedPreferences != null) {
@@ -884,11 +886,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_WIFI_AP(PreferenceAll
                                 } else {
                                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                                    return;
                                 }
                             } else {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                                 preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                                return;
                             }
 
                             boolean sim0Exists;
@@ -982,13 +986,34 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATE_WHEN_RINGING(Prefere
         String preferenceKey = Profile.PREF_PROFILE_VIBRATE_WHEN_RINGING;
 
         if ((PPApplication.deviceIsXiaomi && PPApplication.romIsMIUI) || PPApplication.deviceIsOnePlus) {
-            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-                if (profile != null) {
-                    if (profile._vibrateWhenRinging != 0)
-                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+            if (ShizukuUtils.shizukuAvailable()) {
+                if (ShizukuUtils.hasShizukuPermission()) {
+                    if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                        if (profile != null) {
+                            if (profile._vibrateWhenRinging != 0)
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        } else
+                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                    } else {
+                        preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                        preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                    }
+                } else {
+                    if ((profile != null) && (profile._vibrateWhenRinging != 0)) {
+                        boolean enabled = false;
+                        if ((profile._volumeRingerMode == 1) || (profile._volumeRingerMode == 4))
+                            enabled = true;
+                        if (profile._volumeRingerMode == 5) {
+                            if ((profile._volumeZenMode == 1) || (profile._volumeZenMode == 2))
+                                enabled = true;
+                        }
+                        if (enabled) {
+                            preferenceAllowed.notAllowedShizuku = true;
+                        }
+                    }
+                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
                 }
-                else
-                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
             } else
             if (RootUtils.isRooted(/*fromUIThread*/)) {
                 // device is rooted
@@ -999,6 +1024,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATE_WHEN_RINGING(Prefere
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -1022,6 +1048,14 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATE_WHEN_RINGING(Prefere
                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                 }
+            }
+            else if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+                if (profile != null) {
+                    if (profile._vibrateWhenRinging != 0)
+                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                }
+                else
+                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
             } else {
                 if ((profile != null) && (profile._vibrateWhenRinging != 0)) {
                     boolean enabled = false;
@@ -1071,12 +1105,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATE_NOTIFICATIONS(Prefer
 
                 String preferenceKey = Profile.PREF_PROFILE_VIBRATE_NOTIFICATIONS;
 
-                if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-                    if (profile != null) {
-                        if (profile._vibrateNotifications != 0)
-                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                    } else
-                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                if (ShizukuUtils.shizukuAvailable()) {
+                    if (ShizukuUtils.hasShizukuPermission()) {
+                        if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                            if (profile != null) {
+                                if (profile._vibrateWhenRinging != 0)
+                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                            } else
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        } else {
+                            preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                            preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                        }
+                    } else {
+                        if ((profile != null) && (profile._vibrateNotifications != 0)) {
+                            preferenceAllowed.notAllowedShizuku = true;
+                        }
+                        preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                        preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+                    }
                 } else
                 if (RootUtils.isRooted(/*fromUIThread*/)) {
                     // device is rooted
@@ -1087,6 +1134,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATE_NOTIFICATIONS(Prefer
                             if (applicationNeverAskForGrantRoot) {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                return;
                             }
                         }
                     } else if (sharedPreferences != null) {
@@ -1110,6 +1158,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATE_NOTIFICATIONS(Prefer
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                     }
+                } else
+                if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+                    if (profile != null) {
+                        if (profile._vibrateNotifications != 0)
+                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                    } else
+                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
                 } else {
                     if ((profile != null) && (profile._vibrateNotifications != 0)) {
                         preferenceAllowed.notAllowedPPPPS = true;
@@ -1160,12 +1215,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_RINGING(
         _preferenceAllowed.copyFrom(preferenceAllowed);
         PreferenceAllowed.isProfileCategoryAllowed_PREF_PROFILE_VIBRATION_INTENSITY(_preferenceAllowed, context);
         if (_preferenceAllowed.allowed == PreferenceAllowed.PREFERENCE_ALLOWED) {
-            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-                if (profile != null) {
-                    if (profile.getVibrationIntensityRingingChange())
-                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                } else
-                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+            if (ShizukuUtils.shizukuAvailable()) {
+                if (ShizukuUtils.hasShizukuPermission()) {
+                    if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                        if (profile != null) {
+                            if (profile.getVibrationIntensityRingingChange())
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        } else
+                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                    } else {
+                        preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                        preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                    }
+                } else {
+                    if ((profile != null) && profile.getVibrationIntensityRingingChange()) {
+                        preferenceAllowed.notAllowedShizuku = true;
+                    }
+                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+                }
             } else
             if (RootUtils.isRooted(/*fromUIThread*/)) {
                 // device is rooted
@@ -1180,6 +1248,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_RINGING(
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -1203,6 +1272,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_RINGING(
                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                 }
+            } else
+            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+                if (profile != null) {
+                    if (profile.getVibrationIntensityRingingChange())
+                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                } else
+                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
             } else {
                 if ((profile != null) && profile.getVibrationIntensityRingingChange()) {
                     preferenceAllowed.notAllowedPPPPS = true;
@@ -1225,12 +1301,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICA
         PreferenceAllowed.isProfileCategoryAllowed_PREF_PROFILE_VIBRATION_INTENSITY(_preferenceAllowed, context);
 //        Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICATIONS", "_preferenceAllowed.allowed="+_preferenceAllowed.allowed);
         if (_preferenceAllowed.allowed == PreferenceAllowed.PREFERENCE_ALLOWED) {
-            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-                if (profile != null) {
-                    if (profile.getVibrationIntensityNotificationsChange())
-                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                } else
-                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+            if (ShizukuUtils.shizukuAvailable()) {
+                if (ShizukuUtils.hasShizukuPermission()) {
+                    if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                        if (profile != null) {
+                            if (profile.getVibrationIntensityNotificationsChange())
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        } else
+                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                    } else {
+                        preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                        preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                    }
+                } else {
+                    if ((profile != null) && profile.getVibrationIntensityNotificationsChange()) {
+                        preferenceAllowed.notAllowedShizuku = true;
+                    }
+                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+                }
             } else
             if (RootUtils.isRooted(/*fromUIThread*/)) {
                 // device is rooted
@@ -1245,6 +1334,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICA
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -1268,6 +1358,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICA
                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                 }
+            } else
+            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+                if (profile != null) {
+                    if (profile.getVibrationIntensityNotificationsChange())
+                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                } else
+                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
             } else {
                 if ((profile != null) && profile.getVibrationIntensityNotificationsChange()) {
                     preferenceAllowed.notAllowedPPPPS = true;
@@ -1290,12 +1387,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_IN
         _preferenceAllowed.copyFrom(preferenceAllowed);
         PreferenceAllowed.isProfileCategoryAllowed_PREF_PROFILE_VIBRATION_INTENSITY(_preferenceAllowed, context);
         if (_preferenceAllowed.allowed == PreferenceAllowed.PREFERENCE_ALLOWED) {
-            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-                if (profile != null) {
-                    if (profile.getVibrationIntensityTouchInteractionChange())
-                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                } else
-                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+            if (ShizukuUtils.shizukuAvailable()) {
+                if (ShizukuUtils.hasShizukuPermission()) {
+                    if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                        if (profile != null) {
+                            if (profile.getVibrationIntensityTouchInteractionChange())
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        } else
+                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                    } else {
+                        preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                        preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                    }
+                } else {
+                    if ((profile != null) && profile.getVibrationIntensityTouchInteractionChange()) {
+                        preferenceAllowed.notAllowedShizuku = true;
+                    }
+                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+                }
             } else
             if (RootUtils.isRooted(/*fromUIThread*/)) {
                 // device is rooted
@@ -1310,6 +1420,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_IN
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -1333,6 +1444,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_IN
                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                 }
+            } else
+            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+                if (profile != null) {
+                    if (profile.getVibrationIntensityTouchInteractionChange())
+                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                } else
+                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
             } else {
                 if ((profile != null) && profile.getVibrationIntensityTouchInteractionChange()) {
                     preferenceAllowed.notAllowedPPPPS = true;
@@ -1408,6 +1526,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_POWER_SAVE_MODE(Prefe
                     if (applicationNeverAskForGrantRoot) {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                        return;
                     }
                 }
             }
@@ -1469,15 +1588,16 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_NETWORK_TYPE(Preferen
                                     if (profile._deviceNetworkType != 0)
                                         preferenceAllowed.allowed = PREFERENCE_ALLOWED;
                                 }
-                            }
-                            else {
+                            } else {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                                return;
                             }
                         } else {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                             preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                            return;
                         }
 
                         boolean sim0Exists;
@@ -1498,6 +1618,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_NETWORK_TYPE(Preferen
                                 if (applicationNeverAskForGrantRoot) {
                                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                    return;
                                 }
                             }
                         }
@@ -1525,11 +1646,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_NETWORK_TYPE(Preferen
                             else {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                                return;
                             }
                         } else {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                             preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                            return;
                         }
 
                         boolean sim0Exists;
@@ -1621,6 +1744,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_NETWORK_TYPE_DUAL_SIM
                                     if (applicationNeverAskForGrantRoot) {
                                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                        return;
                                     }
                                 }
                             } else if (sharedPreferences != null) {
@@ -1700,13 +1824,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_NOTIFICATION_LED(PreferenceA
 
         int value = Settings.System.getInt(appContext.getContentResolver(), "notification_light_pulse"/*Settings.System.NOTIFICATION_LIGHT_PULSE*/, -10);
         if (value != -10) {
-            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-//                Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_NOTIFICATION_LED", "installed");
-                if (profile != null) {
-                    if (profile._notificationLed != 0)
-                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                } else
-                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+            if (ShizukuUtils.shizukuAvailable()) {
+                if (ShizukuUtils.hasShizukuPermission()) {
+                    if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                        if (profile != null) {
+                            if (profile._notificationLed != 0)
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        } else
+                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                    } else {
+                        preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                        preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                    }
+                } else {
+                    if ((profile != null) && (profile._notificationLed != 0)) {
+                        preferenceAllowed.notAllowedShizuku = true;
+                    }
+                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+                }
             } else
             if (RootUtils.isRooted(/*fromUIThread*/)) {
                 // device is rooted
@@ -1717,6 +1853,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_NOTIFICATION_LED(PreferenceA
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -1740,6 +1877,14 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_NOTIFICATION_LED(PreferenceA
                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                 }
+            } else
+            if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+//                Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_NOTIFICATION_LED", "installed");
+                if (profile != null) {
+                    if (profile._notificationLed != 0)
+                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                } else
+                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
             } else {
 //                Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_NOTIFICATION_LED", "(2)");
                 if ((profile != null) && (profile._notificationLed != 0)) {
@@ -1878,6 +2023,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_HEADS_UP_NOTIFICATIONS(Prefe
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 }
@@ -1967,6 +2113,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_ALWAYS_ON_DISPLAY(Preference
                     if (profile._alwaysOnDisplay != 0) {
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -2028,6 +2175,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SCREEN_DARK_MODE(PreferenceA
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 }
@@ -2138,15 +2286,18 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_DEFAULT_SIM_CARDS(Pre
                             } else {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                                return;
                             }
                         } else {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
+                            return;
                         }
                     } else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                         preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                        return;
                     }
 
                     boolean sim0Exists;
@@ -2156,7 +2307,6 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_DEFAULT_SIM_CARDS(Pre
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_TWO_SIM_CARDS;
                     }
-
                 } else
                 if (RootUtils.isRooted(/*fromUIThread*/)) {
                     // device is rooted
@@ -2166,6 +2316,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_DEFAULT_SIM_CARDS(Pre
                             if (applicationNeverAskForGrantRoot) {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                return;
                             }
                         }
                     } else if (sharedPreferences != null) {
@@ -2190,15 +2341,18 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_DEFAULT_SIM_CARDS(Pre
                             } else {
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                                return;
                             }
                         } else {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
+                            return;
                         }
                     } else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                         preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                        return;
                     }
 
                     boolean sim0Exists;
@@ -2238,17 +2392,18 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM(PreferenceA
             if (ShizukuUtils.hasShizukuPermission()) {
                 if (ActivateProfileHelper.telephonyServiceExists(Profile.PREF_PROFILE_DEVICE_ONOFF_SIM1)) {
                     if (RootUtils.serviceBinaryExists(fromUIThread)) {
+                        //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(0) PREFERENCE_ALLOWED");
                         if (profile != null) {
                             if ((profile._deviceOnOffSIM1 != 0) ||
                                     (profile._deviceOnOffSIM2 != 0))
                                 preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                        }
-                        else
+                        } else
                             preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                    }
-                    else {
+                    } else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                        //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(1) PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND");
+                        return;
                     }
 
                     final TelephonyManager telephonyManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
@@ -2256,19 +2411,23 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM(PreferenceA
                         int phoneCount = telephonyManager.getPhoneCount();
                         if (phoneCount > 1) {
                             preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                            //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(2) PREFERENCE_ALLOWED");
                         } else {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NO_HARDWARE;
+                            //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(3) PREFERENCE_NOT_ALLOWED_NO_HARDWARE");
                         }
                     } else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                         preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                        //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(4) PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM");
                     }
                 } else {
                     preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                     preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
                     preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+                    //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(5) PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM");
                 }
             } else
             if (RootUtils.isRooted(/*fromUIThread*/)) {
@@ -2281,6 +2440,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM(PreferenceA
                         if (applicationNeverAskForGrantRoot) {
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                            return;
                         }
                     }
                 } else if (sharedPreferences != null) {
@@ -2307,6 +2467,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM(PreferenceA
                     else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SERVICE_NOT_FOUND;
+                        return;
                     }
 
                     final TelephonyManager telephonyManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
@@ -2332,6 +2493,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM(PreferenceA
             } else {
                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+//                Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(4) PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED");
                 if ((profile != null) &&
                         ((profile._deviceOnOffSIM1 != 0) ||
                          (profile._deviceOnOffSIM2 != 0))) {
@@ -2342,6 +2504,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM(PreferenceA
             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
             preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM;
             preferenceAllowed.notAllowedReasonDetail = appContext.getString(R.string.preference_not_allowed_reason_detail_cant_be_change);
+            //Log.e("PreferenceAllowed.isProfilePreferenceAllowed_PREF_PROFILE_DEVICE_ONOFF_SIM", "(6) PREFERENCE_NOT_ALLOWED_NOT_SUPPORTED_BY_SYSTEM");
         }
     }
 
@@ -2403,25 +2566,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SI
                         if (!rootRequired) {
                             ppppsInstalled = ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0;
                         }
-                        if (!rootRequired && ppppsInstalled) {
-                            if (profile != null) {
-                                if ((profile._soundNotificationChangeSIM1 != 0) ||
-                                        (profile._soundNotificationChangeSIM2 != 0))
-                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                            } else
-                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                        } else
-                        if (rootRequired && ShizukuUtils.hasShizukuPermission()) {
-                            if (RootUtils.settingsBinaryExists(fromUIThread)) {
-                                if (profile != null) {
-                                    if ((profile._soundNotificationChangeSIM1 != 0) ||
-                                            (profile._soundNotificationChangeSIM2 != 0))
+                        if (ShizukuUtils.shizukuAvailable()) {
+                            if (ShizukuUtils.hasShizukuPermission()) {
+                                if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                                    if (profile != null) {
+                                        if ((profile._soundNotificationChangeSIM1 != 0) ||
+                                                (profile._soundNotificationChangeSIM2 != 0))
+                                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                                    } else
                                         preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                                } else
-                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                                } else {
+                                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                                }
                             } else {
+                                if (profile != null) {
+                                    preferenceAllowed.notAllowedShizuku = true;
+                                }
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
-                                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
                             }
                         } else
                         if (RootUtils.isRooted(/*fromUIThread*/)) {
@@ -2434,6 +2597,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SI
                                     if (applicationNeverAskForGrantRoot) {
                                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                        return;
                                     }
                                 }
                             } else if (sharedPreferences != null) {
@@ -2458,23 +2622,20 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SI
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                             }
+                        } else
+                        if ((!rootRequired) && ppppsInstalled) {
+                            if (profile != null) {
+                                if ((profile._soundNotificationChangeSIM1 != 0) ||
+                                        (profile._soundNotificationChangeSIM2 != 0))
+                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                            } else
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
                         } else {
                             if (profile != null) {
-                                if (profile._soundNotificationChangeSIM1 != 0)
-                                    preferenceAllowed.notAllowedPPPPS = true;
-                                else
-                                if (profile._soundNotificationChangeSIM2 != 0) {
-                                    if (rootRequired && (!ShizukuUtils.hasShizukuPermission()))
-                                        preferenceAllowed.notAllowedShizuku = true;
-                                    else
-                                        preferenceAllowed.notAllowedPPPPS = true;
-                                }
+                                preferenceAllowed.notAllowedPPPPS = true;
                             }
                             preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
-                            if (rootRequired && (!ShizukuUtils.hasShizukuPermission()))
-                                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
-                            else
-                                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_INSTALLED_PPPPS;
+                            preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_INSTALLED_PPPPS;
                         }
                     } else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
@@ -2515,12 +2676,25 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_SAME_RINGTONE_FOR_BOTH
                 if (telephonyManager != null) {
                     int phoneCount = telephonyManager.getPhoneCount();
                     if (phoneCount > 1) {
-                        if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
-                            if (profile != null) {
-                                if (profile._soundSameRingtoneForBothSIMCards != 0)
-                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                            } else
-                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                        if (ShizukuUtils.shizukuAvailable()) {
+                            if (ShizukuUtils.hasShizukuPermission()) {
+                                if (RootUtils.settingsBinaryExists(fromUIThread)) {
+                                    if (profile != null) {
+                                        if (profile._soundSameRingtoneForBothSIMCards != 0)
+                                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                                    } else
+                                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                                } else {
+                                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
+                                }
+                            } else {
+                                if ((profile != null) && (profile._soundSameRingtoneForBothSIMCards != 0)) {
+                                    preferenceAllowed.notAllowedShizuku = true;
+                                }
+                                preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED;
+                            }
                         } else
                         if (RootUtils.isRooted(/*fromUIThread*/)) {
                             // device is rooted
@@ -2531,6 +2705,7 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_SAME_RINGTONE_FOR_BOTH
                                     if (applicationNeverAskForGrantRoot) {
                                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                         preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOT_GRANTED;
+                                        return;
                                     }
                                 }
                             } else if (sharedPreferences != null) {
@@ -2554,6 +2729,13 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_SAME_RINGTONE_FOR_BOTH
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                             }
+                        } else
+                        if (ActivateProfileHelper.isPPPPutSettingsInstalled(context) > 0) {
+                            if (profile != null) {
+                                if (profile._soundSameRingtoneForBothSIMCards != 0)
+                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                            } else
+                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
                         } else {
                             if ((profile != null) && (profile._soundSameRingtoneForBothSIMCards != 0)) {
                                 preferenceAllowed.notAllowedPPPPS = true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileDurationAlarmBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileDurationAlarmBroadcastReceiver.java
index fd486b3a21..47cc77a762 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileDurationAlarmBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileDurationAlarmBroadcastReceiver.java
@@ -340,6 +340,7 @@ private static void _doWork(Context appContext, final long profileId,
 //            Log.e("ProfileDurationAlarmBroadcastReceiver._doWork", "xxxx");
 
             DataWrapper dataWrapper = new DataWrapper(appContext, false, 0, false, DataWrapper.IT_FOR_EDITOR, 0, 0f);
+            dataWrapper.fillProfileList(false, false);
 
             Profile profile = dataWrapper.getProfileById(profileId, false, false, false);
             if (profile != null) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconColorChooserDialog.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconColorChooserDialog.java
index e5f1fb3901..8265b20409 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconColorChooserDialog.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconColorChooserDialog.java
@@ -262,6 +262,7 @@ private Drawable createSelector(int color) {
         GradientDrawable coloredCircle = new GradientDrawable();
         coloredCircle.setColor(color);
         coloredCircle.setShape(GradientDrawable.OVAL);
+        //noinspection IfStatementWithIdenticalBranches
         if (applicationTheme.equals(ApplicationPreferences.PREF_APPLICATION_THEME_VALUE_WHITE)) {
             //if (position == 2) // dark gray color
             //    coloredCircle.setStroke(2, Color.parseColor("#6E6E6E"));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconPreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconPreference.java
index ec557c51c2..0746175d34 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconPreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileIconPreference.java
@@ -106,6 +106,7 @@ Bitmap getBitmap() {
 
     void getValuePIDP() {
         String[] splits = value.split(StringConstants.STR_SPLIT_REGEX);
+        //noinspection UnreachableCode
         try {
             imageIdentifier = splits[0];
         } catch (Exception e) {
@@ -179,6 +180,7 @@ void setImageIdentifierAndType(String newImageIdentifier, boolean newIsImageReso
             customColor = 0;
         }
         String[] splits = newValue.split(StringConstants.STR_SPLIT_REGEX);
+        //noinspection UnreachableCode
         try {
             imageIdentifier = splits[0];
         } catch (Exception e) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileListWidgetProvider.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileListWidgetProvider.java
index fb1a7d08af..50a21a2959 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileListWidgetProvider.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileListWidgetProvider.java
@@ -38,6 +38,7 @@ public class ProfileListWidgetProvider extends AppWidgetProvider {
 
     private static RemoteViews buildLayout(Context context, /*AppWidgetManager appWidgetManager,*/ int appWidgetId, /*boolean largeLayout,*/ DataWrapper dataWrapper)
     {
+        String applicationWidgetListLauncher;
         boolean applicationWidgetListHeader;
         boolean applicationWidgetListGridLayout;
         boolean applicationWidgetListCompactGrid;
@@ -63,6 +64,7 @@ private static RemoteViews buildLayout(Context context, /*AppWidgetManager appWi
 //        PPApplicationStatic.logE("[SYNCHRONIZED] ProfileListWidgetProvider.buildLayout", "PPApplication.applicationPreferencesMutex");
         synchronized (PPApplication.applicationPreferencesMutex) {
 
+            applicationWidgetListLauncher = ApplicationPreferences.applicationWidgetListLauncher;
             applicationWidgetListHeader = ApplicationPreferences.applicationWidgetListHeader;
             applicationWidgetListGridLayout = ApplicationPreferences.applicationWidgetListGridLayout;
             applicationWidgetListCompactGrid = ApplicationPreferences.applicationWidgetListCompactGrid;
@@ -760,10 +762,16 @@ private static RemoteViews buildLayout(Context context, /*AppWidgetManager appWi
             Intent intent = new Intent(context, EditorActivity.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             */
-        Intent intent = GlobalGUIRoutines.getIntentForStartupSource(context, PPApplication.STARTUP_SOURCE_WIDGET);
+        //Intent intent = GlobalGUIRoutines.getIntentForStartupSource(context, PPApplication.STARTUP_SOURCE_WIDGET);
+        Intent intent;
+        if (applicationWidgetListLauncher.equals(StringConstants.EXTRA_ACTIVATOR))
+            intent = new Intent(context.getApplicationContext(), ActivatorActivity.class);
+        else
+            intent = new Intent(context.getApplicationContext(), EditorActivity.class);
         // clear all opened activities
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_EDITOR_WIDGET_HEADER);
+        //intent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_EDITOR_WIDGET_HEADER);
+        intent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_WIDGET);
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
         widget.setOnClickPendingIntent(R.id.widget_profile_list_header_profile_root, pendingIntent);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileStatic.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileStatic.java
index b29d8a51cf..9e41387ca8 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileStatic.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfileStatic.java
@@ -24,6 +24,10 @@
 /** @noinspection ExtractMethodRecommender*/
 class ProfileStatic {
 
+    private ProfileStatic() {
+        // private constructor to prevent instantiation
+    }
+
     static String getIconIdentifier(String icon)
     {
         String value;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfilesPrefsFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfilesPrefsFragment.java
index 1a0c798cff..8415a558c9 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfilesPrefsFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ProfilesPrefsFragment.java
@@ -630,8 +630,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
             PPListPreference listPreference = prefMng.findPreference(Profile.PREF_PROFILE_VIBRATE_WHEN_RINGING);
             if (listPreference != null)
             {
-                listPreference.setTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_vibrateWhenRinging));
-                listPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_vibrateWhenRinging));
+                listPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_vibrateWhenRinging));
+                listPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_vibrateWhenRinging));
                 String value = preferences.getString(Profile.PREF_PROFILE_VIBRATE_WHEN_RINGING, "");
                 setSummary(Profile.PREF_PROFILE_VIBRATE_WHEN_RINGING, value);
             }
@@ -654,8 +654,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
                      (preferenceAllowed.notAllowedReason == PreferenceAllowed.PREFERENCE_NOT_ALLOWED_SHIZUKU_NOT_GRANTED)||
                      (preferenceAllowed.notAllowedReason == PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_INSTALLED_PPPPS))) {
                 if (vibrateNotificationsPreference != null) {
-                    vibrateNotificationsPreference.setTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrateNotifications));
-                    vibrateNotificationsPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrateNotifications));
+                    vibrateNotificationsPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrateNotifications));
+                    vibrateNotificationsPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrateNotifications));
                     String value = preferences.getString(Profile.PREF_PROFILE_VIBRATE_NOTIFICATIONS, "");
                     setSummary(Profile.PREF_PROFILE_VIBRATE_NOTIFICATIONS, value);
                 }
@@ -675,22 +675,22 @@ public void onActivityCreated(Bundle savedInstanceState) {
         if (_preferenceAllowed.allowed == PreferenceAllowed.PREFERENCE_ALLOWED) {
             VibrationIntensityPreference vibrationIntensityPreference = prefMng.findPreference(Profile.PREF_PROFILE_VIBRATION_INTENSITY_RINGING);
             if (vibrationIntensityPreference != null) {
-                vibrationIntensityPreference.setTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityRinging));
-                vibrationIntensityPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityRinging));
+                vibrationIntensityPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityRinging));
+                vibrationIntensityPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityRinging));
                 String value = preferences.getString(Profile.PREF_PROFILE_VIBRATION_INTENSITY_RINGING, "-1|1");
                 setSummary(Profile.PREF_PROFILE_VIBRATION_INTENSITY_RINGING, value);
             }
             vibrationIntensityPreference = prefMng.findPreference(Profile.PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICATIONS);
             if (vibrationIntensityPreference != null) {
-                vibrationIntensityPreference.setTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityNotificatiions));
-                vibrationIntensityPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityNotificatiions));
+                vibrationIntensityPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityNotificatiions));
+                vibrationIntensityPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityNotificatiions));
                 String value = preferences.getString(Profile.PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICATIONS, "-1|1");
                 setSummary(Profile.PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICATIONS, value);
             }
             vibrationIntensityPreference = prefMng.findPreference(Profile.PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_INTERACTION);
             if (vibrationIntensityPreference != null) {
-                vibrationIntensityPreference.setTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction));
-                vibrationIntensityPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction));
+                vibrationIntensityPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction));
+                vibrationIntensityPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction));
                 String value = preferences.getString(Profile.PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_INTERACTION, "-1|1");
                 setSummary(Profile.PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_INTERACTION, value);
             }
@@ -1004,8 +1004,19 @@ public boolean onPreferenceClick(Preference preference) {
                             (preferenceAllowed.notAllowedReason == PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_INSTALLED_PPPPS)));
         }
 
+        PPListPreference notificationLEDPreference = findPreference(Profile.PREF_PROFILE_NOTIFICATION_LED);
+        if (notificationLEDPreference != null) {
+            notificationLEDPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_notificationLed_23));
+            notificationLEDPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_notificationLed_23));
+            String value = preferences.getString(Profile.PREF_PROFILE_NOTIFICATION_LED, "");
+            setSummary(Profile.PREF_PROFILE_NOTIFICATION_LED, value);
+        }
         preference = findPreference(PREF_NOTIFICATION_LED_INFO);
         if (preference != null) {
+            preference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_notificationLed_23));
+            //preference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction));
+            //String value = preferences.getString(Profile.PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_INTERACTION, "-1|1");
+            //setSummary(Profile.PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_INTERACTION, value);
             PreferenceAllowed preferenceAllowed = ProfileStatic.isProfilePreferenceAllowed(Profile.PREF_PROFILE_NOTIFICATION_LED, null, preferences, true, context);
             preference.setEnabled((preferenceAllowed.allowed == PreferenceAllowed.PREFERENCE_ALLOWED) ||
                     ((preferenceAllowed.notAllowedReason == PreferenceAllowed.PREFERENCE_NOT_ALLOWED_NOT_GRANTED_G1_PERMISSION) ||
@@ -1178,8 +1189,8 @@ public boolean onPreferenceClick(Preference preference) {
                         if (listPreference != null) {
                             PreferenceAllowed preferenceAllowedSIM1 = ProfileStatic.isProfilePreferenceAllowed(Profile.PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SIM1, null, preferences, true, context);
 
-                            listPreference.setTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_soundNotificationChangeSIM1));
-                            listPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_soundNotificationChangeSIM1));
+                            listPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_soundNotificationChangeSIM1));
+                            listPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_soundNotificationChangeSIM1));
                             String value = preferences.getString(Profile.PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SIM1, "");
                             setSummary(Profile.PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SIM1, value);
 
@@ -1195,8 +1206,8 @@ public boolean onPreferenceClick(Preference preference) {
                         if (ringtonePreference != null) {
                             PreferenceAllowed preferenceAllowedSIM1 = ProfileStatic.isProfilePreferenceAllowed(Profile.PREF_PROFILE_SOUND_NOTIFICATION_SIM1, null, preferences, true, context);
 
-                            ringtonePreference.setTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_soundNotificationSIM1));
-                            ringtonePreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_soundNotificationSIM1));
+                            ringtonePreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_soundNotificationSIM1));
+                            ringtonePreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_soundNotificationSIM1));
                             String value = preferences.getString(Profile.PREF_PROFILE_SOUND_NOTIFICATION_SIM1, "");
                             setSummary(Profile.PREF_PROFILE_SOUND_NOTIFICATION_SIM1, value);
 
@@ -1217,8 +1228,8 @@ public boolean onPreferenceClick(Preference preference) {
                                 listPreference.setTitle(StringConstants.STR_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationChangeSIM2));
                                 listPreference.setDialogTitle(StringConstants.STR_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationChangeSIM2));
                             } else {
-                                listPreference.setTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_soundNotificationChangeSIM2));
-                                listPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_soundNotificationChangeSIM2));
+                                listPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationChangeSIM2));
+                                listPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationChangeSIM2));
                             }
                             String value = preferences.getString(Profile.PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SIM2, "");
                             setSummary(Profile.PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SIM2, value);
@@ -1239,8 +1250,8 @@ public boolean onPreferenceClick(Preference preference) {
                                 ringtonePreference.setTitle(StringConstants.STR_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationSIM2));
                                 ringtonePreference.setDialogTitle(StringConstants.STR_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationSIM2));
                             } else {
-                                ringtonePreference.setTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_soundNotificationSIM2));
-                                ringtonePreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_soundNotificationSIM2));
+                                ringtonePreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationSIM2));
+                                ringtonePreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_soundNotificationSIM2));
                             }
                             String value = preferences.getString(Profile.PREF_PROFILE_SOUND_NOTIFICATION_SIM2, "");
                             setSummary(Profile.PREF_PROFILE_SOUND_NOTIFICATION_SIM2, value);
@@ -1399,8 +1410,8 @@ public boolean onPreferenceClick(Preference preference) {
         else {
             PPListPreference listPreference = findPreference(Profile.PREF_PROFILE_SOUND_SAME_RINGTONE_FOR_BOTH_SIM_CARDS);
             if (listPreference != null) {
-                listPreference.setTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_soundSameRingtoneForBothSIMCards));
-                listPreference.setDialogTitle(StringConstants.STR_PPPPS_ROOT+getString(R.string.profile_preferences_soundSameRingtoneForBothSIMCards));
+                listPreference.setTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_soundSameRingtoneForBothSIMCards));
+                listPreference.setDialogTitle(StringConstants.STR_PPPPS_SHIZUKU_ROOT+getString(R.string.profile_preferences_soundSameRingtoneForBothSIMCards));
                 String value = preferences.getString(Profile.PREF_PROFILE_SOUND_SAME_RINGTONE_FOR_BOTH_SIM_CARDS, "");
                 setSummary(Profile.PREF_PROFILE_SOUND_SAME_RINGTONE_FOR_BOTH_SIM_CARDS, value);
             }
@@ -2224,11 +2235,11 @@ private String getCategoryTitleWhenPreferenceChanged(String key, int preferenceT
                                     if (!((PPApplication.deviceIsSamsung && PPApplication.romIsGalaxy) ||
                                             PPApplication.deviceIsOnePlus)) {
                                         if (key.equals(Profile.PREF_PROFILE_VIBRATION_INTENSITY_RINGING))
-                                            title = StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityRinging);
+                                            title = StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityRinging);
                                         else if (key.equals(Profile.PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICATIONS))
-                                            title = StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityNotificatiions);
+                                            title = StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityNotificatiions);
                                         else/* if (key.equals(Profile.PREF_PROFILE_VIBRATION_INTENSITY_TOUCH_INTERACTION))*/
-                                            title = StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction);
+                                            title = StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrationIntensityTouchInteraction);
                                     } else
                                         title = getString(preferenceTitleId);
                                 }
@@ -2238,9 +2249,9 @@ else if (key.equals(Profile.PREF_PROFILE_VIBRATION_INTENSITY_NOTIFICATIONS))
                                     if (key.equals(Profile.PREF_PROFILE_VIBRATE_WHEN_RINGING) &&
                                             ((PPApplication.deviceIsXiaomi && PPApplication.romIsMIUI) ||
                                                     PPApplication.deviceIsOnePlus))
-                                        title = StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrateWhenRinging);
+                                        title = StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrateWhenRinging);
                                     else if (key.equals(Profile.PREF_PROFILE_VIBRATE_NOTIFICATIONS))
-                                        title = StringConstants.STR_PPPPS_ROOT + getString(R.string.profile_preferences_vibrateNotifications);
+                                        title = StringConstants.STR_PPPPS_SHIZUKU_ROOT + getString(R.string.profile_preferences_vibrateNotifications);
                                     else if (key.equals(Profile.PREF_PROFILE_DURATION))
                                         title = context.getString(R.string.profile_preferences_duration);
                                     else
@@ -4958,27 +4969,30 @@ private void setSummary(String key, Object value)
             Preference preference = prefMng.findPreference(key);
             if (preference != null) {
                 String summary;
-                boolean bold = false;
-                if (ApplicationPreferences.applicationUnlinkRingerNotificationVolumes) {
-                    summary = getString(R.string.profile_preferences_applicationUnlinkRingerNotificationVolumes_enabled);
-                    bold = true;
-                }
-                else
-                    summary = getString(R.string.profile_preferences_applicationUnlinkRingerNotificationVolumes_disabled);
 
-                summary = summary + StringConstants.CHAR_NEW_LINE + getString(R.string.phone_profiles_pref_applicationForceSetMergeRingNotificationVolumes) + ": ";
                 int forceMergeValue = ApplicationPreferences.applicationForceSetMergeRingNotificationVolumes;
                 String[] valuesArray = getResources().getStringArray(R.array.forceSetMergeRingNotificationVolumesValues);
                 String[] labelsArray = getResources().getStringArray(R.array.forceSetMergeRingNotificationVolumesArray);
-                int index = 0;
+                int setVolumeLinkIndex = 0;
                 for (String _value : valuesArray) {
                     if (_value.equals(String.valueOf(forceMergeValue))) {
-                        summary = summary + labelsArray[index];
                         break;
                     }
-                    ++index;
+                    ++setVolumeLinkIndex;
                 }
 
+                boolean bold = false;
+                if ((ApplicationPreferences.prefMergedRingNotificationVolumes || (setVolumeLinkIndex == 1)) &&
+                        ApplicationPreferences.applicationUnlinkRingerNotificationVolumes) {
+                    summary = getString(R.string.profile_preferences_applicationUnlinkRingerNotificationVolumes_enabled);
+                    bold = true;
+                }
+                else
+                    summary = getString(R.string.profile_preferences_applicationUnlinkRingerNotificationVolumes_disabled);
+
+                summary = summary + StringConstants.CHAR_NEW_LINE + getString(R.string.phone_profiles_pref_applicationForceSetMergeRingNotificationVolumes) + ": ";
+                summary = summary + labelsArray[setVolumeLinkIndex];
+
                 if (!ApplicationPreferences.prefMergedRingNotificationVolumes)
                     // detection of volumes merge = volumes are not merged
                     summary = summary + StringConstants.STR_DOUBLE_NEWLINE + getString(R.string.profile_preferences_applicationUnlinkRingerNotificationVolumes_not_merged);
@@ -8199,21 +8213,44 @@ else if (accessibilityEnabled == -1)
                                 }
                             }
                             if (preference != null) {
-                                int stringRes = R.string.preferences_not_installed_PPPPutSettings_title;
-                                String _title = order + ". " + context.getString(stringRes);
-                                ++order;
-                                Spannable title = new SpannableString(_title);
-                                title.setSpan(new ForegroundColorSpan(errorColor), 0, title.length(), 0);
-                                preference.setTitle(title);
-                                _title = context.getString(R.string.event_preferences_red_install_PPPExtender);
-                                Spannable summary = new SpannableString(_title);
-                                summary.setSpan(new ForegroundColorSpan(errorColor), 0, summary.length(), 0);
-                                preference.setSummary(summary);
-
-                                preference.setOnPreferenceClickListener(preference15 -> {
-                                    PPPPSDialogPreferenceFragment.installPPPPutSettings(activity, null, false);
-                                    return false;
-                                });
+                                /*int shizukuInstalled = ActivateProfileHelper.isShizukuInstalled(context);
+                                Log.e("ProfilePreferenceFragment.SetRedTextToPreferencesAsyncTask", "shizukuInstalled="+shizukuInstalled);
+                                if (shizukuInstalled != 0) {
+                                    if (!ShizukuUtils.hasShizukuPermission()) {
+                                        // Shizuku is installed but not started
+                                        String _title;
+                                        _title = order + ". " + context.getString(R.string.preferences_grantShizukuPreferences_title);
+                                        ++order;
+                                        Spannable title = new SpannableString(_title);
+                                        title.setSpan(new ForegroundColorSpan(errorColor), 0, title.length(), 0);
+                                        preference.setTitle(title);
+                                        Spannable summary;
+                                        summary = new SpannableString(context.getString(R.string.preferences_grantShizukuPreferences_summary));
+                                        summary.setSpan(new ForegroundColorSpan(errorColor), 0, summary.length(), 0);
+                                        preference.setSummary(summary);
+
+                                        preference.setOnPreferenceClickListener(preference12 -> {
+                                            Permissions.grantShizukuPermission(fragment, activity);
+                                            return false;
+                                        });
+                                    }
+                                } else {*/
+                                    int stringRes = R.string.preferences_not_installed_PPPPutSettings_title;
+                                    String _title = order + ". " + context.getString(stringRes);
+                                    ++order;
+                                    Spannable title = new SpannableString(_title);
+                                    title.setSpan(new ForegroundColorSpan(errorColor), 0, title.length(), 0);
+                                    preference.setTitle(title);
+                                    _title = context.getString(R.string.event_preferences_red_install_PPPExtender);
+                                    Spannable summary = new SpannableString(_title);
+                                    summary.setSpan(new ForegroundColorSpan(errorColor), 0, summary.length(), 0);
+                                    preference.setSummary(summary);
+
+                                    preference.setOnPreferenceClickListener(preference15 -> {
+                                        PPPPSDialogPreferenceFragment.installPPPPutSettings(activity, null, false);
+                                        return false;
+                                    });
+                                //}
                             }
                         }
                     }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/QuickTileChooseTileBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/QuickTileChooseTileBroadcastReceiver.java
index 89a2a02794..e1abdecf8e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/QuickTileChooseTileBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/QuickTileChooseTileBroadcastReceiver.java
@@ -85,7 +85,7 @@ public void onReceive(Context context, Intent intent) {
                     }
                     PPApplication.showToast(appContext, toast, Toast.LENGTH_LONG);
 
-                    DataWrapperStatic.setDynamicLauncherShortcuts(appContext);
+                    DataWrapperStatic.setDynamicLauncherShortcuts(appContext, false);
 
                     dataWrapper.invalidateDataWrapper();
                 } catch (Exception e) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsFromGUIActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsFromGUIActivity.java
index e294393b48..7417f2f0b2 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsFromGUIActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsFromGUIActivity.java
@@ -147,6 +147,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] RestartEventsFromGUIActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             return true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsIconColorChooserPreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsIconColorChooserPreference.java
index 640cac0e68..8a89bfe6b2 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsIconColorChooserPreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RestartEventsIconColorChooserPreference.java
@@ -157,6 +157,7 @@ Drawable createSelector(int color) {
         GradientDrawable coloredCircle = new GradientDrawable();
         coloredCircle.setColor(color);
         coloredCircle.setShape(GradientDrawable.OVAL);
+        //noinspection IfStatementWithIdenticalBranches
         if (applicationTheme.equals(ApplicationPreferences.PREF_APPLICATION_THEME_VALUE_WHITE)) {
             //if (position == 2) // dark gray color
             //    coloredCircle.setStroke(2, Color.parseColor("#6E6E6E"));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingerModeChangeReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingerModeChangeReceiver.java
index e86f7138f7..99a85d147b 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingerModeChangeReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingerModeChangeReceiver.java
@@ -28,7 +28,7 @@ private static int getRingerMode(Context context, AudioManager audioManager) {
         // convert to profile ringerMode
         int pRingerMode = 0;
         int systemZenMode = ActivateProfileHelper.getSystemZenMode(context/*, -1*/);
-        if (systemZenMode == ActivateProfileHelper.ZENMODE_ALL) {
+        if (systemZenMode == ActivateProfileHelper.SYSTEM_ZENMODE_ALL) {
             switch (ringerMode) {
                 case AudioManager.RINGER_MODE_NORMAL:
                     //if (ActivateProfileHelper.vibrationIsOn(/*context, */audioManager, false))
@@ -55,7 +55,7 @@ static void setRingerMode(Context context, AudioManager audioManager/*, String f
         if (pRingerMode != 0) {
             int systemZenMode = ActivateProfileHelper.getSystemZenMode(context);
             ActivateProfileHelper.saveZenMode(context, systemZenMode);
-            if (systemZenMode == ActivateProfileHelper.ZENMODE_ALL)
+            if (systemZenMode == ActivateProfileHelper.SYSTEM_ZENMODE_ALL)
                 ActivateProfileHelper.saveRingerMode(context, pRingerMode);
             else
                 ActivateProfileHelper.saveRingerMode(context, Profile.RINGERMODE_ZENMODE);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingtonePreference.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingtonePreference.java
index 48dfe38bd5..ba405e84ce 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingtonePreference.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RingtonePreference.java
@@ -159,7 +159,9 @@ void stopPlayRingtone() {
                         mediaPlayer = null;
 
                         if (oldMediaVolume > -1)
-                            ActivateProfileHelper.setMediaVolume(appContext, audioManager, oldMediaVolume, true, false);
+                            ActivateProfileHelper.setMediaVolume(appContext, audioManager,
+                                    audioManager.getStreamVolume(AudioManager.STREAM_MUSIC),
+                                    oldMediaVolume, true, false);
                         if (oldMediaMuted) {
                             PPApplication.volumesInternalChange = true;
                             audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
@@ -272,7 +274,9 @@ void playRingtone() {
                             PPApplication.volumesInternalChange = true;
                             audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_UNMUTE, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
                         }
-                        ActivateProfileHelper.setMediaVolume(appContext, audioManager, mediaVolume, true, false);
+                        ActivateProfileHelper.setMediaVolume(appContext, audioManager,
+                                audioManager.getStreamVolume(AudioManager.STREAM_MUSIC),
+                                mediaVolume, true, false);
 
                         mediaPlayer.start();
                         ringtoneIsPlayed = true;
@@ -299,7 +303,9 @@ public void run() {
                                         }
 
                                         if (oldMediaVolume > -1)
-                                            ActivateProfileHelper.setMediaVolume(appContext, audioManager, oldMediaVolume, true, false);
+                                            ActivateProfileHelper.setMediaVolume(appContext, audioManager,
+                                                    audioManager.getStreamVolume(AudioManager.STREAM_MUSIC),
+                                                    oldMediaVolume, true, false);
                                         if (oldMediaMuted) {
                                             PPApplication.volumesInternalChange = true;
                                             audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootMutex.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootMutex.java
index 806e8f43bb..462cbfda7f 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootMutex.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootMutex.java
@@ -24,6 +24,7 @@ class RootMutex {
     int transactionCode_setDefaultSmsSubId;
     int transactionCode_setDefaultDataSubId;
     int transactionCode_setSubscriptionEnabled;
+    int transactionCode_setSimPowerStateForSlot;
     int transactionCode_setWifiApEnabled;
 
     static final String SERVICE_PHONE = "phone";
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootToolsSmall.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootToolsSmall.java
index 46b930c1cc..daec0f252c 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootToolsSmall.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootToolsSmall.java
@@ -10,6 +10,10 @@ class RootToolsSmall {
     // keep using HashMap (over ArrayMap), because in PATH environment may be duplicated paths
     private static final HashMap<String, Boolean> BIN_MAP = new HashMap<>();
 
+    private RootToolsSmall() {
+        // private constructor to prevent instantiation
+    }
+
     private static boolean hasBinary(String binaryName) {
         Boolean exists = BIN_MAP.get(binaryName);
         if (exists != null) {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootUtils.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootUtils.java
index cfe0905901..848cda3a13 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootUtils.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/RootUtils.java
@@ -22,6 +22,10 @@
 
 class RootUtils {
 
+    private RootUtils() {
+        // private constructor to prevent instantiation
+    }
+
     static synchronized void initRoot() {
 //        PPApplicationStatic.logE("[SYNCHRONIZED] RootUtils.initRoot", "PPApplication.rootMutex");
         synchronized (PPApplication.rootMutex) {
@@ -37,6 +41,22 @@ static synchronized void initRoot() {
             //PPApplication.rootMutex.suVersionChecked = false;
             PPApplication.rootMutex.serviceBinaryChecked = false;
             PPApplication.rootMutex.serviceBinaryExists = false;
+
+            PPApplication.rootMutex.serviceManagerPhone = null;
+            PPApplication.rootMutex.serviceManagerWifi = null;
+            PPApplication.rootMutex.serviceManagerIsub = null;
+
+            /* this is not used, used is "svc data"
+            PPApplication.rootMutex.transactionCode_setUserDataEnabled = -1;
+            PPApplication.rootMutex.transactionCode_setDataEnabled = -1;
+            */
+            PPApplication.rootMutex.transactionCode_setPreferredNetworkType = -1;
+            PPApplication.rootMutex.transactionCode_setDefaultVoiceSubId = -1;
+            PPApplication.rootMutex.transactionCode_setDefaultSmsSubId = -1;
+            PPApplication.rootMutex.transactionCode_setDefaultDataSubId = -1;
+            PPApplication.rootMutex.transactionCode_setSubscriptionEnabled = -1;
+            PPApplication.rootMutex.transactionCode_setSimPowerStateForSlot = -1;
+            PPApplication.rootMutex.transactionCode_setWifiApEnabled = -1;
         }
     }
 
@@ -161,13 +181,13 @@ static void isRootGranted(/*boolean onlyCheck*/)
 
     static boolean settingsBinaryExists(boolean fromUIThread)
     {
-        if (ShizukuUtils.hasShizukuPermission()) {
-            if (PPApplication.rootMutex.settingsBinaryChecked)
-                return PPApplication.rootMutex.settingsBinaryExists;
+        if (PPApplication.rootMutex.settingsBinaryChecked)
+            return PPApplication.rootMutex.settingsBinaryExists;
 
-            if (fromUIThread)
-                return false;
+        if (fromUIThread)
+            return false;
 
+        if (ShizukuUtils.hasShizukuPermission()) {
             synchronized (PPApplication.rootMutex) {
                 if (!PPApplication.rootMutex.settingsBinaryChecked) {
                     PPApplication.rootMutex.settingsBinaryExists = ShizukuUtils.hasSettingBin();
@@ -178,12 +198,6 @@ static boolean settingsBinaryExists(boolean fromUIThread)
         } else {
             RootShell.debugMode = PPApplication.rootToolsDebug;
 
-            if (PPApplication.rootMutex.settingsBinaryChecked)
-                return PPApplication.rootMutex.settingsBinaryExists;
-
-            if (fromUIThread)
-                return false;
-
 //        PPApplicationStatic.logE("[SYNCHRONIZED] RootUtils.settingsBinaryExists", "PPApplication.rootMutex");
             synchronized (PPApplication.rootMutex) {
                 if (RootUtils.isRooted()) {
@@ -200,13 +214,13 @@ static boolean settingsBinaryExists(boolean fromUIThread)
 
     static boolean serviceBinaryExists(boolean fromUIThread)
     {
-        if (ShizukuUtils.hasShizukuPermission()) {
-            if (PPApplication.rootMutex.serviceBinaryChecked)
-                return PPApplication.rootMutex.serviceBinaryExists;
+        if (PPApplication.rootMutex.serviceBinaryChecked)
+            return PPApplication.rootMutex.serviceBinaryExists;
 
-            if (fromUIThread)
-                return false;
+        if (fromUIThread)
+            return false;
 
+        if (ShizukuUtils.hasShizukuPermission()) {
             synchronized (PPApplication.rootMutex) {
                 if (!PPApplication.rootMutex.serviceBinaryChecked) {
                     PPApplication.rootMutex.serviceBinaryExists = ShizukuUtils.hasServiceBin();
@@ -217,12 +231,6 @@ static boolean serviceBinaryExists(boolean fromUIThread)
         } else {
             RootShell.debugMode = PPApplication.rootToolsDebug;
 
-            if (PPApplication.rootMutex.serviceBinaryChecked)
-                return PPApplication.rootMutex.serviceBinaryExists;
-
-            if (fromUIThread)
-                return false;
-
 //        PPApplicationStatic.logE("[SYNCHRONIZED] RootUtils.serviceBinaryExists", "PPApplication.rootMutex");
             synchronized (PPApplication.rootMutex) {
                 if (RootUtils.isRooted()) {
@@ -472,6 +480,10 @@ private static void fillTransactionCodes() {
 //            Log.e("RootUtils.fillTransactionCodes", "PPApplication.rootMutex.transactionCode_setSubscriptionEnabled="+PPApplication.rootMutex.transactionCode_setSubscriptionEnabled);
         }
 
+        PPApplication.rootMutex.transactionCode_setSimPowerStateForSlot = -1;
+        if (PPApplication.rootMutex.serviceManagerPhone != null)
+            PPApplication.rootMutex.transactionCode_setSimPowerStateForSlot = getTransactionCode(String.valueOf(PPApplication.rootMutex.serviceManagerPhone), "setSimPowerStateForSlot");
+
         // used only in API < 28
         PPApplication.rootMutex.transactionCode_setWifiApEnabled = -1;
         if (PPApplication.rootMutex.serviceManagerWifi != null) {
@@ -480,7 +492,7 @@ private static void fillTransactionCodes() {
         }
     }
 
-    private static Object getServiceManager(String serviceType) {
+    static Object getServiceManager(String serviceType) {
 //        PPApplicationStatic.logE("[SYNCHRONIZED] RootUtils.getServiceManager", "PPApplication.serviceListMutex");
         synchronized (PPApplication.serviceListMutex) {
             if (PPApplication.serviceListMutex.serviceList != null) {
@@ -495,9 +507,11 @@ private static Object getServiceManager(String serviceType) {
         }
     }
 
-    private static int getTransactionCode(String serviceManager, String method) {
-//        PPApplicationStatic.logE("[DUAL_SIM] PPApplication.getTransactionCode", "serviceManager="+serviceManager);
-//        PPApplicationStatic.logE("[DUAL_SIM] PPApplication.getTransactionCode", "method="+method);
+    static int getTransactionCode(String serviceManager, String method) {
+        /*if (method.isEmpty()) {
+            Log.e("RootUtils.getTransactionCode", "serviceManager=" + serviceManager);
+            Log.e("RootUtils.getTransactionCode", "method=" + method);
+        }*/
         int code = -1;
         try {
             //noinspection rawtypes
@@ -508,10 +522,10 @@ private static int getTransactionCode(String serviceManager, String method) {
                 while (iField < length) {
                     Field field = declaredFields2[iField];
                     String name = field.getName();
-//                    PPApplicationStatic.logE("[DUAL_SIM] PPApplication.getTransactionCode", "filed.name="+name);
+//                    Log.e("RootUtils.getTransactionCode", "filed.name="+name);
                     if (method.isEmpty()) {
-//                        if (name.contains("TRANSACTION_"))
-//                            PPApplicationStatic.logE("[DUAL_SIM] PPApplication.getTransactionCode", "field.getName()="+name);
+                        //if (name.contains("TRANSACTION_"))
+                        //    Log.e("RootUtils.getTransactionCode", "field.getName()="+name);
                         iField++;
                     }
                     else {
@@ -521,7 +535,7 @@ private static int getTransactionCode(String serviceManager, String method) {
                             try {
                                 field.setAccessible(true);
                                 code = field.getInt(field);
-//                                PPApplicationStatic.logE("[DUAL_SIM] PPApplication.getTransactionCode", "name="+name+",  code="+code);
+//                                PPApplicationStatic.logE("[DUAL_SIM] RootUtils.getTransactionCode", "name="+name+",  code="+code);
                                 break;
                             } catch (Exception e) {
                                 //Log.e("RootUtils.getTransactionCode", Log.getStackTraceString(e));
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ScreenOnOffBroadcastReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ScreenOnOffBroadcastReceiver.java
index 8dd1f9e8e4..907dc133ce 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ScreenOnOffBroadcastReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ScreenOnOffBroadcastReceiver.java
@@ -71,6 +71,7 @@ public void onReceive(Context context, Intent intent) {
                                     if (profile != null) {
                                         if (profile.getDeviceBrightnessChange()) {
                                             if (Permissions.checkProfileScreenBrightness(appContext, profile, null)) {
+                                                //noinspection UnreachableCode
                                                 try {
 //                                                    if (PPApplicationStatic.logEnabled()) {
 //                                                        int brightnessMode = Settings.System.getInt(appContext.getContentResolver(), Settings.System.SCREEN_BRIGHTNESS_MODE, -1);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ShizukuUtils.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ShizukuUtils.java
index bdea6622a6..d74ac5a084 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ShizukuUtils.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/ShizukuUtils.java
@@ -11,6 +11,11 @@
  * Some convenience functions for handling using Shizuku.
  */
 class ShizukuUtils {
+
+    private ShizukuUtils() {
+        // private constructor to prevent instantiation
+    }
+
     /**
      * Checks if Shizuku is available. If the Shizuku Manager app
      * is either uninstalled OR isn't running, this will return
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StartLauncherFromNotificationReceiver.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StartLauncherFromNotificationReceiver.java
index 14716c5d3d..558c0cd4a5 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StartLauncherFromNotificationReceiver.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StartLauncherFromNotificationReceiver.java
@@ -3,9 +3,6 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
-
-import java.util.concurrent.TimeUnit;
 
 // Disable action button
 /** @noinspection ExtractMethodRecommender*/
@@ -13,6 +10,7 @@ public class StartLauncherFromNotificationReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+/*
 //        PPApplicationStatic.logE("[IN_BROADCAST] StartLauncherFromNotificationReceiver.onReceive", "xxx");
 
         if (intent != null) {
@@ -31,7 +29,7 @@ public void onReceive(Context context, Intent intent) {
 
                             Intent launcherIntent = GlobalGUIRoutines.getIntentForStartupSource(appContext, PPApplication.STARTUP_SOURCE_NOTIFICATION);
                             // clear all opened activities
-                            launcherIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK/*|Intent.FLAG_ACTIVITY_NO_ANIMATION*/);
+                            launcherIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
                             // setup startupSource
                             launcherIntent.putExtra(PPApplication.EXTRA_STARTUP_SOURCE, PPApplication.STARTUP_SOURCE_NOTIFICATION);
                             appContext.startActivity(launcherIntent);
@@ -58,6 +56,7 @@ public void onReceive(Context context, Intent intent) {
                 }
             }
         }
+*/
     }
 
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringConstants.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringConstants.java
index a140323ced..a0830e35b6 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringConstants.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringConstants.java
@@ -21,7 +21,8 @@ class StringConstants {
     static final String STR_COLON_WITH_SPACE = ": ";
     //static final String STR_ROOT = "(R) ";
     //static final String STR_PPPPS = "(S) ";
-    static final String STR_PPPPS_ROOT = "(S)(R) ";
+    //static final String STR_PPPPS_ROOT = "(S)(R) ";
+    static final String STR_PPPPS_SHIZUKU_ROOT = "(S)(Z)(R) ";
     static final String STR_SHIZUKU_ROOT = "(Z)(R) ";
     //static final String STR_INTERFACE = "(I) ";
     //static final String STR_G1 = "(G1) ";
@@ -85,4 +86,16 @@ class StringConstants {
 
     static final String CONTACTS_FILTER_DATA_ALL = "[all]";
 
+    private StringConstants() {
+        // private constructor to prevent instantiation
+    }
+
+    /*
+    static String getPPPPSBySDK() {
+        if (Build.VERSION.SDK_INT >= 34)
+            return STR_SHIZUKU_ROOT;
+        else
+            return STR_PPPPS_SHIZUKU_ROOT;
+    }
+    */
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringFormatUtils.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringFormatUtils.java
index 3ba7abb330..95044dd756 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringFormatUtils.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/StringFormatUtils.java
@@ -26,6 +26,10 @@
 
 class StringFormatUtils {
 
+    private StringFormatUtils() {
+        // private constructor to prevent instantiation
+    }
+
     static String formatDateTime(Context context, String timeToFormat) {
 
         String finalDateTime = "";
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserActivity.java
index b1caaf195d..2c2ddd773d 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserActivity.java
@@ -230,6 +230,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] TileChooserActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             //return true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserLongClickActivity.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserLongClickActivity.java
index 8894fdb3a7..d2cf85ebf2 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserLongClickActivity.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TileChooserLongClickActivity.java
@@ -167,6 +167,7 @@ private boolean startPPServiceWhenNotStarted() {
             serviceIntent.putExtra(PPApplication.EXTRA_APPLICATION_START, true);
             serviceIntent.putExtra(PPApplication.EXTRA_DEVICE_BOOT, false);
             serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_ON_PACKAGE_REPLACE, false);
+            serviceIntent.putExtra(PhoneProfilesService.EXTRA_START_FOR_SHIZUKU_START, false);
 //            PPApplicationStatic.logE("[START_PP_SERVICE] TileChooserLongClickActivity.startPPServiceWhenNotStarted", "(1)");
             PPApplicationStatic.startPPService(this, serviceIntent, true);
             //return true;
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TonesHandler.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TonesHandler.java
index 8139b7acb2..a079405111 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TonesHandler.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/TonesHandler.java
@@ -15,6 +15,10 @@ class TonesHandler {
     static final String NOTIFICATION_TONE_URI_NONE = "content://settings/system/notification_sound";
     static final String ALARM_TONE_URI_NONE = "content://settings/system/alarm_alert";
 
+    private TonesHandler() {
+        // private constructor to prevent instantiation
+    }
+
     /*
     static String getPhoneProfilesSilentUri(Context context, int type) {
         try {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VibrationIntensityPreferenceFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VibrationIntensityPreferenceFragment.java
index 7d63fe2756..1279af0087 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VibrationIntensityPreferenceFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VibrationIntensityPreferenceFragment.java
@@ -92,7 +92,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         if (fromUser) {
             // Round the value to the closest integer value.
-            //noinspection ConstantConditions
+            //noinspection UnreachableCode,ConstantValue
             if (preference.stepSize >= 1) {
                 preference.value = Math.round((float) progress / preference.stepSize) * preference.stepSize;
             } else {
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VolumeDialogPreferenceFragment.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VolumeDialogPreferenceFragment.java
index 6544767b8d..c9bafce508 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VolumeDialogPreferenceFragment.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/VolumeDialogPreferenceFragment.java
@@ -172,10 +172,14 @@ public void onDialogClosed(boolean positiveResult) {
 
             if (/*(appContext != null) &&*/ (_preference != null)) {
                 if (_preference.usedValueMusic != -1)
-                    ActivateProfileHelper.setMediaVolume(appContext, _preference.audioManager, _preference.usedValueMusic, true, false);
+                    if (_preference.audioManager != null)
+                        ActivateProfileHelper.setMediaVolume(appContext, _preference.audioManager,
+                                _preference.audioManager.getStreamVolume(AudioManager.STREAM_MUSIC),
+                                _preference.usedValueMusic, true, false);
                 if (_preference.oldMediaMuted) {
                     PPApplication.volumesInternalChange = true;
-                    _preference.audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
+                    if (_preference.audioManager != null)
+                        _preference.audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE);
 
                     PPExecutors.scheduleDisableVolumesInternalChangeExecutor();
                 }
@@ -194,8 +198,10 @@ public void onDialogClosed(boolean positiveResult) {
                 }
                 if (playTimer != null) {
                     playTimer.cancel();
-                    playTimer = null;
                 }
+
+                mediaPlayer = null;
+                playTimer = null;
             }
         };
         PPApplicationStatic.createPlayToneExecutor();
@@ -239,7 +245,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         if (fromUser) {
             // Round the value to the closest integer value.
-            //noinspection ConstantConditions
+            //noinspection UnreachableCode, ConstantConditions
             if (preference.stepSize >= 1) {
                 preference.value = Math.round((float) progress / preference.stepSize) * preference.stepSize;
             } else {
@@ -275,7 +281,10 @@ public void onStopTrackingTouch(SeekBar seekBar) {
 
                 PPExecutors.scheduleDisableVolumesInternalChangeExecutor();
             }
-            ActivateProfileHelper.setMediaVolume(context, preference.audioManager, volume, true, false);
+            if (preference.audioManager != null)
+                ActivateProfileHelper.setMediaVolume(context, preference.audioManager,
+                        preference.audioManager.getStreamVolume(AudioManager.STREAM_MUSIC),
+                        volume, true, false);
 
             final Context appContext = context.getApplicationContext();
             final WeakReference<VolumeDialogPreference> preferenceWeakRef = new WeakReference<>(preference);
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/WakelockTags.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/WakelockTags.java
index 4d272efdd6..bd120ec54e 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/WakelockTags.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/WakelockTags.java
@@ -81,4 +81,8 @@ class WakelockTags {
     static final String WAKELOCK_TAG_WifiAPStateChangeBroadcastReceiver_onReceive = PPApplication.PACKAGE_NAME + ":WifiAPStateChangeBroadcastReceiver_onReceive";
     static final String WAKELOCK_TAG_WifiStateChangedBroadcastReceiver_onReceive = PPApplication.PACKAGE_NAME + ":WifiStateChangedBroadcastReceiver_onReceive";
 
+    private WakelockTags() {
+        // private constructor to prevent instantiation
+    }
+
 }
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Wildcard.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Wildcard.java
index 27c444f1b3..612f781cd0 100644
--- a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Wildcard.java
+++ b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/Wildcard.java
@@ -13,6 +13,10 @@
  */
 class Wildcard {
 
+    private Wildcard() {
+        // private constructor to prevent instantiation
+    }
+
     /*
      * Checks whether a string matches a given wildcard pattern.
      *
diff --git a/phoneProfilesPlus/src/main/res/layout-v34/dialog_install_pppps_34.xml b/phoneProfilesPlus/src/main/res/layout-v34/dialog_install_pppps_34.xml
new file mode 100644
index 0000000000..a9bba17132
--- /dev/null
+++ b/phoneProfilesPlus/src/main/res/layout-v34/dialog_install_pppps_34.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/install_pppps_from_github_dialog_root2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/alert_dialog_top_padding"
+    android:paddingBottom="3dp">
+
+    <View
+        android:id="@+id/install_pppps_from_github_dialog_titleBarDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginStart="@dimen/divider_margin"
+        android:layout_marginEnd="@dimen/divider_margin"
+        android:background="@color/dialog_divider" />
+
+    <ScrollView
+        android:id="@+id/install_pppps_from_github_dialog_root"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:scrollbarStyle="outsideOverlay"
+        android:fadeScrollbars="false">
+
+        <LinearLayout
+            android:id="@+id/install_pppps_from_github_dialog_linla0"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp"
+            android:paddingBottom="15dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text0"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:paddingBottom="5dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:paddingBottom="5dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:paddingBottom="5dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:paddingBottom="5dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:paddingBottom="5dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_info_text7"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/install_pppps_from_github_dialog_github_releases"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/install_pppps_from_github_dialog_showAssets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/install_extender_where_is_assets_button"
+                android:minHeight="40dp"
+                android:textColor="@color/action_button_text_color"
+                android:textStyle="bold"
+                android:background="@drawable/pp_button_background_selector"
+                android:visibility="gone"
+                style="?android:attr/borderlessButtonStyle" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/install_pppps_from_github_dialog_buttonsDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginStart="@dimen/divider_margin"
+        android:layout_marginEnd="@dimen/divider_margin"
+        android:gravity="bottom"
+        android:layout_gravity="bottom"
+        android:background="@color/dialog_divider" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/phoneProfilesPlus/src/main/res/layout/activity_about_application.xml b/phoneProfilesPlus/src/main/res/layout/activity_about_application.xml
index 7b2f0ffd40..d4ab684f54 100644
--- a/phoneProfilesPlus/src/main/res/layout/activity_about_application.xml
+++ b/phoneProfilesPlus/src/main/res/layout/activity_about_application.xml
@@ -149,6 +149,7 @@
                     android:text="@string/about_application_author"
                     android:textSize="15sp" />
 
+<!--
                 <TextView
                     android:id="@+id/about_application_support"
                     android:layout_width="wrap_content"
@@ -159,6 +160,7 @@
                     android:layout_marginBottom="10dp"
                     android:text="@string/about_application_support"
                     android:textSize="15sp" />
+-->
 
                 <TextView
                     android:id="@+id/about_application_privacy_policy"
@@ -231,6 +233,7 @@
                     android:text="@string/about_application_pppps_source_code"
                     android:textSize="15sp" />
 
+                <!--
                 <TextView
                     android:id="@+id/about_application_xda_developers_community"
                     android:layout_width="wrap_content"
@@ -240,6 +243,7 @@
                     android:layout_marginEnd="10dp"
                     android:text="@string/about_application_xda_developers_community"
                     android:textSize="15sp" />
+                -->
 
                 <!--
                 <TextView
diff --git a/phoneProfilesPlus/src/main/res/layout/dialog_for_neostore.xml b/phoneProfilesPlus/src/main/res/layout/dialog_for_neostore.xml
new file mode 100644
index 0000000000..c3078ab8d9
--- /dev/null
+++ b/phoneProfilesPlus/src/main/res/layout/dialog_for_neostore.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/dialog_for_neostore_root2"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:paddingTop="@dimen/alert_dialog_top_padding"
+    android:paddingBottom="3dp">
+
+    <View
+        android:id="@+id/dialog_for_neostore_titleBarDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginStart="@dimen/divider_margin"
+        android:layout_marginEnd="@dimen/divider_margin"
+        android:background="@color/dialog_divider" />
+
+    <ScrollView
+        android:id="@+id/dialog_for_neostore_root"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:scrollbarStyle="outsideOverlay"
+        android:fadeScrollbars="false"
+        tools:ignore="UselessParent">
+
+        <LinearLayout
+            android:id="@+id/dialog_for_neostore_linla0"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/dialog_for_neostore_info_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/dialog_for_neostore_neostore_application"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/dialog_for_neostore_apk_installation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginStart="22dp"
+                android:layout_marginEnd="22dp"
+                android:text=""
+                android:textSize="16sp"
+                android:visibility="gone"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/dialog_for_neostore_buttonsDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginStart="@dimen/divider_margin"
+        android:layout_marginEnd="@dimen/divider_margin"
+        android:layout_marginTop="5dp"
+        android:background="@color/dialog_divider" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/phoneProfilesPlus/src/main/res/layout/dialog_with_edittext.xml b/phoneProfilesPlus/src/main/res/layout/dialog_with_edittext.xml
new file mode 100644
index 0000000000..d675996ac5
--- /dev/null
+++ b/phoneProfilesPlus/src/main/res/layout/dialog_with_edittext.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/dialog_with_edittext_root2"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:paddingTop="@dimen/alert_dialog_top_padding">
+
+    <View
+        android:id="@+id/dialog_with_edittext_titleBarDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginStart="@dimen/divider_margin"
+        android:layout_marginEnd="@dimen/divider_margin"
+        android:background="@color/dialog_divider" />
+
+<ScrollView android:id="@+id/dialog_with_edittext_root"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
+    android:scrollbarStyle="outsideOverlay"
+    android:fadeScrollbars="false"
+    tools:ignore="UselessParent">
+
+    <LinearLayout
+        android:id="@+id/dialog_with_edittext_liLa1"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:paddingBottom="10dp">
+
+        <TextView
+            android:id="@+id/dialog_with_edittext_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="7dp"
+            android:text=""
+            android:textSize="16sp" />
+
+        <EditText
+            android:id="@+id/dialog_with_edittext_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:importantForAutofill="no"
+            android:inputType="textNoSuggestions"
+            android:textSize="18sp"
+            android:clickable="true"
+            android:focusable="true"
+            tools:ignore="LabelFor" />
+
+    </LinearLayout>
+
+</ScrollView>
+
+    <View
+        android:id="@+id/dialog_with_edittext_buttonBarDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginStart="@dimen/divider_margin"
+        android:layout_marginEnd="@dimen/divider_margin"
+        android:layout_marginBottom="3dp"
+        android:background="@color/dialog_divider" />
+
+</LinearLayout>
diff --git a/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom.xml b/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom.xml
index 2f9c00aae7..73fa4d0b0d 100644
--- a/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom.xml
+++ b/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom.xml
@@ -9,10 +9,20 @@
         android:id="@+id/widget_samsung_edge_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_alignParentBottom="true">
 
+        <LinearLayout
+            android:id="@+id/widget_samsung_edge_buttonsDivider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:background="@color/dialog_divider" />
+
         <ImageView
             android:id="@+id/widget_samsung_edge_settings"
             android:layout_width="40dp"
diff --git a/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom_no_header.xml b/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom_no_header.xml
index 25121f6524..4eda5a7caf 100644
--- a/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom_no_header.xml
+++ b/phoneProfilesPlus/src/main/res/layout/samsung_edge_bottom_no_header.xml
@@ -9,10 +9,20 @@
         android:id="@+id/widget_samsung_edge_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_alignParentBottom="true">
 
+        <LinearLayout
+            android:id="@+id/widget_samsung_edge_buttonsDivider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:background="@color/dialog_divider" />
+
         <ImageView
             android:id="@+id/widget_samsung_edge_settings"
             android:layout_width="40dp"
diff --git a/phoneProfilesPlus/src/main/res/layout/samsung_edge_center.xml b/phoneProfilesPlus/src/main/res/layout/samsung_edge_center.xml
index 7ffdd65e98..be70d69f22 100644
--- a/phoneProfilesPlus/src/main/res/layout/samsung_edge_center.xml
+++ b/phoneProfilesPlus/src/main/res/layout/samsung_edge_center.xml
@@ -9,10 +9,20 @@
         android:id="@+id/widget_samsung_edge_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_alignParentBottom="true">
 
+        <LinearLayout
+            android:id="@+id/widget_samsung_edge_buttonsDivider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:background="@color/dialog_divider" />
+
         <ImageView
             android:id="@+id/widget_samsung_edge_settings"
             android:layout_width="40dp"
diff --git a/phoneProfilesPlus/src/main/res/layout/samsung_edge_center_no_header.xml b/phoneProfilesPlus/src/main/res/layout/samsung_edge_center_no_header.xml
index 86c0cdd324..0efa7e15c2 100644
--- a/phoneProfilesPlus/src/main/res/layout/samsung_edge_center_no_header.xml
+++ b/phoneProfilesPlus/src/main/res/layout/samsung_edge_center_no_header.xml
@@ -9,10 +9,20 @@
         android:id="@+id/widget_samsung_edge_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_alignParentBottom="true">
 
+        <LinearLayout
+            android:id="@+id/widget_samsung_edge_buttonsDivider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:background="@color/dialog_divider" />
+
         <ImageView
             android:id="@+id/widget_samsung_edge_settings"
             android:layout_width="40dp"
diff --git a/phoneProfilesPlus/src/main/res/layout/samsung_edge_top.xml b/phoneProfilesPlus/src/main/res/layout/samsung_edge_top.xml
index 7cce63bce8..245e6d78a9 100644
--- a/phoneProfilesPlus/src/main/res/layout/samsung_edge_top.xml
+++ b/phoneProfilesPlus/src/main/res/layout/samsung_edge_top.xml
@@ -9,10 +9,20 @@
         android:id="@+id/widget_samsung_edge_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_alignParentBottom="true">
 
+        <LinearLayout
+            android:id="@+id/widget_samsung_edge_buttonsDivider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:background="@color/dialog_divider" />
+
         <ImageView
             android:id="@+id/widget_samsung_edge_settings"
             android:layout_width="40dp"
diff --git a/phoneProfilesPlus/src/main/res/layout/samsung_edge_top_no_header.xml b/phoneProfilesPlus/src/main/res/layout/samsung_edge_top_no_header.xml
index fc3d47eac0..7743587c90 100644
--- a/phoneProfilesPlus/src/main/res/layout/samsung_edge_top_no_header.xml
+++ b/phoneProfilesPlus/src/main/res/layout/samsung_edge_top_no_header.xml
@@ -9,10 +9,20 @@
         android:id="@+id/widget_samsung_edge_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_alignParentBottom="true">
 
+        <LinearLayout
+            android:id="@+id/widget_samsung_edge_buttonsDivider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_height"
+            android:layout_marginBottom="5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:orientation="horizontal"
+            android:background="@color/dialog_divider" />
+
         <ImageView
             android:id="@+id/widget_samsung_edge_settings"
             android:layout_width="40dp"
diff --git a/phoneProfilesPlus/src/main/res/menu/editor_top_bar.xml b/phoneProfilesPlus/src/main/res/menu/editor_top_bar.xml
index 5dbd71d0a5..43636ef9b0 100644
--- a/phoneProfilesPlus/src/main/res/menu/editor_top_bar.xml
+++ b/phoneProfilesPlus/src/main/res/menu/editor_top_bar.xml
@@ -115,6 +115,55 @@
                 android:title="@string/menu_email_debug_logs_to_author"
                 android:orderInCategory="102"
                 app:showAsAction="never" />
+            <item android:id="@+id/menu_discord"
+                android:title="@string/menu_discord"
+                android:orderInCategory="103"
+                app:showAsAction="never">
+                <menu>
+                    <item android:id="@+id/menu_discord_server"
+                        android:title="@string/menu_discord_server"
+                        android:orderInCategory="100"
+                        app:showAsAction="never" />
+                    <item android:id="@+id/menu_discord_invitation"
+                        android:title="@string/menu_discord_invitation"
+                        android:orderInCategory="101"
+                        app:showAsAction="never" />
+<!--
+                    <item android:id="@+id/menu_discord_help"
+                        android:title="@string/menu_discord_help"
+                        android:orderInCategory="102"
+                        app:showAsAction="never" />
+                    <item android:id="@+id/menu_discord_bugs"
+                        android:title="@string/menu_discord_bugs"
+                        android:orderInCategory="103"
+                        app:showAsAction="never" />
+                    <item android:id="@+id/menu_discord_suggestions"
+                        android:title="@string/menu_discord_suggestions"
+                        android:orderInCategory="104"
+                        app:showAsAction="never" />
+                    <item android:id="@+id/menu_discord_discussion"
+                        android:title="@string/menu_discord_discussion"
+                        android:orderInCategory="105"
+                        app:showAsAction="never" />
+-->
+                </menu>
+            </item>
+            <item android:id="@+id/menu_xda_developers"
+                android:title="@string/menu_xda_developers"
+                android:orderInCategory="104"
+                app:showAsAction="never" />
+            <item android:id="@+id/menu_twitter"
+                android:title="@string/menu_twitter"
+                android:orderInCategory="105"
+                app:showAsAction="never" />
+            <item android:id="@+id/menu_reddit"
+                android:title="@string/menu_reddit"
+                android:orderInCategory="106"
+                app:showAsAction="never" />
+            <item android:id="@+id/menu_bluesky"
+                android:title="@string/menu_bluesky"
+                android:orderInCategory="106"
+                app:showAsAction="never" />
         </menu>
     </item>
 
@@ -124,26 +173,22 @@
         app:showAsAction="never" >
 
         <menu>
-<!--            <item android:id="@+id/menu_check_in_galaxy_store"-->
-<!--                android:title="@string/menu_check_releases_galaxy_store"-->
-<!--                android:orderInCategory="100"-->
-<!--                app:showAsAction="never" />-->
             <item android:id="@+id/menu_check_in_appgallery"
                 android:title="@string/menu_check_releases_appgallery"
                 android:orderInCategory="101"
                 app:showAsAction="never" />
             <item android:id="@+id/menu_check_in_droidify"
                 android:title="@string/menu_check_releases_droidify"
+                android:orderInCategory="102"
+                app:showAsAction="never" />
+            <item android:id="@+id/menu_check_in_neostore"
+                android:title="@string/menu_check_releases_neostore"
                 android:orderInCategory="103"
                 app:showAsAction="never" />
             <item android:id="@+id/menu_check_in_fdroid"
                 android:title="@string/menu_check_releases_fdroid"
-                android:orderInCategory="103"
+                android:orderInCategory="104"
                 app:showAsAction="never" />
-<!--            <item android:id="@+id/menu_check_in_amazon_appstore"-->
-<!--                android:title="@string/menu_check_releases_amazon_appstore"-->
-<!--                android:orderInCategory="104"-->
-<!--                app:showAsAction="never" />-->
             <item android:id="@+id/menu_check_in_apkpure"
                 android:title="@string/menu_check_releases_apkpure"
                 android:orderInCategory="105"
diff --git a/phoneProfilesPlus/src/main/res/values/attrs.xml b/phoneProfilesPlus/src/main/res/values/attrs.xml
index 72a4cdb819..1724932a19 100644
--- a/phoneProfilesPlus/src/main/res/values/attrs.xml
+++ b/phoneProfilesPlus/src/main/res/values/attrs.xml
@@ -94,6 +94,10 @@
     <declare-styleable name="WallpaperViewPreference">
         <attr name="forLockScreen" format="boolean" />
     </declare-styleable>
+<!--    <declare-styleable name="PPPPSDialogPreference">-->
+<!--        <attr name="requiredPPPPSVersionCode" format="integer" />-->
+<!--        <attr name="requiredPPPPSVersionName" format="string" />-->
+<!--    </declare-styleable>-->
 
     <!-- theme dependent drawables -->
     <!--    <attr name="activityBackgroundColor" format="reference" />-->
diff --git a/phoneProfilesPlus/src/main/res/values/key.xml b/phoneProfilesPlus/src/main/res/values/key.xml
new file mode 100644
index 0000000000..9ee9c353a8
--- /dev/null
+++ b/phoneProfilesPlus/src/main/res/values/key.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources >
+    <item
+        type="id"
+        name="editMenuTagCell" />
+    <item
+        type="id"
+        name="editMenuTagCellLong" />
+</resources>
\ No newline at end of file
diff --git a/phoneProfilesPlus/src/main/res/xml-v28/phone_profiles_prefs_interface.xml b/phoneProfilesPlus/src/main/res/xml-v28/phone_profiles_prefs_interface.xml
index 4479eb38d6..70ea9cf9dc 100644
--- a/phoneProfilesPlus/src/main/res/xml-v28/phone_profiles_prefs_interface.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v28/phone_profiles_prefs_interface.xml
@@ -33,22 +33,22 @@
 <!--        app:ppEntries="@array/launcherArray"-->
 <!--        app:ppEntryValues="@array/launcherValues"-->
 <!--        app:layout="@layout/mp_preference_material_widget" />-->
-    <sk.henrichg.phoneprofilesplus.PPListPreference
-        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
-        app:summary="@string/array_pref_launcher_activator"
-        app:key="applicationWidgetLauncher"
-        app:defaultValue="@string/activator_string"
-        app:ppEntries="@array/launcherArray"
-        app:ppEntryValues="@array/launcherValues"
-        app:layout="@layout/mp_preference_material_widget" />
-    <sk.henrichg.phoneprofilesplus.PPListPreference
-        app:title="@string/phone_profiles_pref_notificationLauncher"
-        app:summary="@string/array_pref_launcher_activator"
-        app:key="applicationNotificationLauncher"
-        app:defaultValue="@string/activator_string"
-        app:ppEntries="@array/launcherArray"
-        app:ppEntryValues="@array/launcherValues"
-        app:layout="@layout/mp_preference_material_widget" />
+<!--    <sk.henrichg.phoneprofilesplus.PPListPreference-->
+<!--        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"-->
+<!--        app:summary="@string/array_pref_launcher_activator"-->
+<!--        app:key="applicationWidgetLauncher"-->
+<!--        app:defaultValue="@string/activator_string"-->
+<!--        app:ppEntries="@array/launcherArray"-->
+<!--        app:ppEntryValues="@array/launcherValues"-->
+<!--        app:layout="@layout/mp_preference_material_widget" />-->
+<!--    <sk.henrichg.phoneprofilesplus.PPListPreference-->
+<!--        app:title="@string/phone_profiles_pref_notificationLauncher"-->
+<!--        app:summary="@string/array_pref_launcher_activator"-->
+<!--        app:key="applicationNotificationLauncher"-->
+<!--        app:defaultValue="@string/activator_string"-->
+<!--        app:ppEntries="@array/launcherArray"-->
+<!--        app:ppEntryValues="@array/launcherValues"-->
+<!--        app:layout="@layout/mp_preference_material_widget" />-->
 
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
         app:key="applicationCreateEditorShortcut"
diff --git a/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_app_notification.xml b/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_app_notification.xml
index 9dc922057e..83c3bd6565 100644
--- a/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_app_notification.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_app_notification.xml
@@ -16,6 +16,15 @@
         app:summary="@string/phone_profiles_pref_notificationSystemSettingsAll_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_notificationLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationNotificationLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <PreferenceCategory
         app:key="notificationStatusBarCategory"
         app:title="@string/phone_profiles_pref_notificationStatusBarCategory"
diff --git a/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_wifi_scanning.xml b/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_wifi_scanning.xml
index dd7fa8e0a3..508ddd48cc 100644
--- a/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_wifi_scanning.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v29/phone_profiles_prefs_wifi_scanning.xml
@@ -17,7 +17,7 @@
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
         app:key="applicationEventWiFiLocationSystemSettings"
         app:title="@string/phone_profiles_pref_eventLocationSystemSettings"
-        app:summary="@string/phone_profiles_pref_eventWiFiLocationSystemSettings_summary"
+        app:summary="@string/phone_profiles_pref_eventWiFiLocationSystemSettings_summary_api29"
         app:dependency="applicationEventWifiEnableScannig"
         app:layout="@layout/mp_preference_material_widget" />
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
diff --git a/phoneProfilesPlus/src/main/res/xml-v29/profile_prefs_volumes.xml b/phoneProfilesPlus/src/main/res/xml-v29/profile_prefs_volumes.xml
index 05acc5a724..f4236b1cf9 100644
--- a/phoneProfilesPlus/src/main/res/xml-v29/profile_prefs_volumes.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v29/profile_prefs_volumes.xml
@@ -94,6 +94,11 @@
             app:summary="@string/volume_pref_dialog_no_change_chb"
             app:layout="@layout/mp_preference_material_widget" />
 
+        <sk.henrichg.phoneprofilesplus.InformationPreference
+            app:key="prf_pref_volumeMergedRingSyatemVolumeInfo"
+            app:title="@string/profile_preferences_volumeSystem"
+            app:summary="@string/profile_preferences_volumeMergedRingSyatemVolumeInfo_summary"
+            app:layout="@layout/mp_preference_material_widget" />
         <sk.henrichg.phoneprofilesplus.VolumeDialogPreference
             app:key="prf_pref_volumeSystem"
             app:forVolumesSensor="0"
@@ -102,6 +107,7 @@
             app:title="@string/profile_preferences_volumeSystem"
             app:summary="@string/volume_pref_dialog_no_change_chb"
             app:layout="@layout/mp_preference_material_widget" />
+
         <sk.henrichg.phoneprofilesplus.VolumeDialogPreference
             app:key="prf_pref_volumeVoice"
             app:forVolumesSensor="0"
diff --git a/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_icon.xml b/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_icon.xml
index 2561687c14..d8df1a0d07 100644
--- a/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_icon.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_icon.xml
@@ -10,6 +10,15 @@
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetIconLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <sk.henrichg.phoneprofilesplus.PPListPreference
         app:title="@string/phone_profiles_pref_applicationWidgetLayoutHeight"
         app:summary="0"
diff --git a/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_list.xml b/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_list.xml
index 0829241657..821ca3a98b 100644
--- a/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_list.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_list.xml
@@ -9,6 +9,16 @@
         app:title="@string/phone_profiles_pref_widget_not_working_miui_info"
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetListLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <SwitchPreferenceCompat
         app:key="applicationWidgetListHeader"
         app:title="@string/phone_profiles_pref_applicationHeader"
diff --git a/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_one_row.xml b/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_one_row.xml
index ac6a89867d..bf44370c5b 100644
--- a/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_one_row.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v30/phone_profiles_prefs_widget_one_row.xml
@@ -10,6 +10,15 @@
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetOneRowLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <sk.henrichg.phoneprofilesplus.PPListPreference
         app:title="@string/phone_profiles_pref_applicationWidgetLayoutHeight"
         app:summary="0"
diff --git a/phoneProfilesPlus/src/main/res/xml-v30/profile_prefs_volumes.xml b/phoneProfilesPlus/src/main/res/xml-v30/profile_prefs_volumes.xml
index e4a1702d04..c44f19e37b 100644
--- a/phoneProfilesPlus/src/main/res/xml-v30/profile_prefs_volumes.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v30/profile_prefs_volumes.xml
@@ -99,6 +99,11 @@
             app:summary="@string/volume_pref_dialog_no_change_chb"
             app:layout="@layout/mp_preference_material_widget" />
 
+        <sk.henrichg.phoneprofilesplus.InformationPreference
+            app:key="prf_pref_volumeMergedRingSyatemVolumeInfo"
+            app:title="@string/profile_preferences_volumeSystem"
+            app:summary="@string/profile_preferences_volumeMergedRingSyatemVolumeInfo_summary"
+            app:layout="@layout/mp_preference_material_widget" />
         <sk.henrichg.phoneprofilesplus.VolumeDialogPreference
             app:key="prf_pref_volumeSystem"
             app:forVolumesSensor="0"
@@ -107,6 +112,7 @@
             app:title="@string/profile_preferences_volumeSystem"
             app:summary="@string/volume_pref_dialog_no_change_chb"
             app:layout="@layout/mp_preference_material_widget" />
+
         <sk.henrichg.phoneprofilesplus.VolumeDialogPreference
             app:key="prf_pref_volumeVoice"
             app:forVolumesSensor="0"
diff --git a/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_icon.xml b/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_icon.xml
index 14f1771a27..7b3f173a23 100644
--- a/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_icon.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_icon.xml
@@ -10,6 +10,15 @@
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetIconLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <sk.henrichg.phoneprofilesplus.PPListPreference
         app:title="@string/phone_profiles_pref_applicationWidgetLayoutHeight"
         app:summary="0"
diff --git a/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_list.xml b/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_list.xml
index 0e78ac1d81..4855418fe9 100644
--- a/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_list.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_list.xml
@@ -9,6 +9,16 @@
         app:title="@string/phone_profiles_pref_widget_not_working_miui_info"
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetListLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <SwitchPreferenceCompat
         app:key="applicationWidgetListHeader"
         app:title="@string/phone_profiles_pref_applicationHeader"
diff --git a/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_one_row.xml b/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_one_row.xml
index 4c93a178df..253358ae37 100644
--- a/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_one_row.xml
+++ b/phoneProfilesPlus/src/main/res/xml-v31/phone_profiles_prefs_widget_one_row.xml
@@ -10,6 +10,15 @@
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetOneRowLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <sk.henrichg.phoneprofilesplus.PPListPreference
         app:title="@string/phone_profiles_pref_applicationWidgetLayoutHeight"
         app:summary="0"
diff --git a/phoneProfilesPlus/src/main/res/xml-v31/profile_prefs_radios_dual_sim_support.xml b/phoneProfilesPlus/src/main/res/xml-v31/profile_prefs_radios_dual_sim_support.xml
new file mode 100644
index 0000000000..258b1df268
--- /dev/null
+++ b/phoneProfilesPlus/src/main/res/xml-v31/profile_prefs_radios_dual_sim_support.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:title="@string/profile_preferences_deviceDualSIMSupport"
+    app:key="prf_pref_deviceRadiosDualSIMSupportCategory" >
+
+    <Preference
+        app:key="prf_pref_deviceRadiosDualSIMSupportInfo"
+        app:title="@string/profile_preferences_deviceDualSIMSupport_summary"
+        app:summary=""
+        app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.ExclamationPreference
+        app:key="prf_pref_deviceOnOffSIMPINCode"
+        app:title="@string/profile_preferences_deviceDualSIMPINCode_title"
+        app:summary="@string/profile_preferences_deviceDualSIMPINCode_summary"
+        app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/profile_preferences_deviceOnOff_SIM1"
+        app:summary="@string/array_pref_no_change"
+        app:key="prf_pref_deviceOnOffSIM1"
+        app:defaultValue="0"
+        app:ppEntries="@array/onOffSIMArray"
+        app:ppEntryValues="@array/onOffSIMValues"
+        app:layout="@layout/mp_preference_material_widget" />
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/profile_preferences_deviceOnOff_SIM2"
+        app:summary="@string/array_pref_no_change"
+        app:key="prf_pref_deviceOnOffSIM2"
+        app:defaultValue="0"
+        app:ppEntries="@array/onOffSIMArray"
+        app:ppEntryValues="@array/onOffSIMValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.DefaultSIMDialogPreference
+        app:key="prf_pref_deviceDefaultSIMCards"
+        app:defaultValue="0|0|0"
+        app:title="@string/profile_preferences_deviceDefaultSIM"
+        app:summary="@string/profile_preferences_deviceDefaultSIM"
+        app:layout="@layout/mp_preference_material_widget" />
+
+<!--
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/profile_preferences_deviceMobileData_21_SIM1"
+        app:summary="@string/array_pref_no_change"
+        app:key="prf_pref_deviceMobileDataSIM1"
+        app:defaultValue="0"
+        app:ppEntries="@array/hardwareModeArray"
+        app:ppEntryValues="@array/hardwareModeValues"
+        app:layout="@layout/mp_preference_material_widget" />
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/profile_preferences_deviceMobileData_21_SIM2"
+        app:summary="@string/array_pref_no_change"
+        app:key="prf_pref_deviceMobileDataSIM2"
+        app:defaultValue="0"
+        app:ppEntries="@array/hardwareModeArray"
+        app:ppEntryValues="@array/hardwareModeValues"
+        app:layout="@layout/mp_preference_material_widget" />
+-->
+
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/profile_preferences_deviceNetworkTypeSIM1"
+        app:summary="@string/array_pref_no_change"
+        app:key="prf_pref_deviceNetworkTypeSIM1"
+        app:defaultValue="0"
+        app:ppEntries="@array/networkTypeNotSupportedArray"
+        app:ppEntryValues="@array/networkTypeNotSupportedValues"
+        app:layout="@layout/mp_preference_material_widget" />
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/profile_preferences_deviceNetworkTypeSIM2"
+        app:summary="@string/array_pref_no_change"
+        app:key="prf_pref_deviceNetworkTypeSIM2"
+        app:defaultValue="0"
+        app:ppEntries="@array/networkTypeNotSupportedArray"
+        app:ppEntryValues="@array/networkTypeNotSupportedValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/phoneProfilesPlus/src/main/res/xml/event_prefs_time_sensor.xml b/phoneProfilesPlus/src/main/res/xml/event_prefs_time_sensor.xml
index a594a9e2c0..e6530a964d 100644
--- a/phoneProfilesPlus/src/main/res/xml/event_prefs_time_sensor.xml
+++ b/phoneProfilesPlus/src/main/res/xml/event_prefs_time_sensor.xml
@@ -47,7 +47,7 @@
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
         app:key="eventTimeLocationSystemSettings"
         app:title="@string/phone_profiles_pref_eventLocationSystemSettings"
-        app:summary="@string/phone_profiles_pref_eventWiFiLocationSystemSettings_summary"
+        app:summary="@string/event_preference_sensor_time_locationSystemSettings_summary"
         app:dependency="eventTimeEnabled"
         app:layout="@layout/mp_preference_material_widget" />
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_app_notification.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_app_notification.xml
index a5f466296b..b4a2d9561c 100644
--- a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_app_notification.xml
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_app_notification.xml
@@ -16,6 +16,15 @@
         app:summary="@string/phone_profiles_pref_notificationSystemSettingsAll_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_notificationLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationNotificationLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <PreferenceCategory
         app:key="notificationStatusBarCategory"
         app:title="@string/phone_profiles_pref_notificationStatusBarCategory"
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_interface.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_interface.xml
index dd375be5a1..547a507c26 100644
--- a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_interface.xml
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_interface.xml
@@ -33,22 +33,22 @@
 <!--        app:ppEntries="@array/launcherArray"-->
 <!--        app:ppEntryValues="@array/launcherValues"-->
 <!--        app:layout="@layout/mp_preference_material_widget" />-->
-    <sk.henrichg.phoneprofilesplus.PPListPreference
-        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
-        app:summary="@string/array_pref_launcher_activator"
-        app:key="applicationWidgetLauncher"
-        app:defaultValue="@string/activator_string"
-        app:ppEntries="@array/launcherArray"
-        app:ppEntryValues="@array/launcherValues"
-        app:layout="@layout/mp_preference_material_widget" />
-    <sk.henrichg.phoneprofilesplus.PPListPreference
-        app:title="@string/phone_profiles_pref_notificationLauncher"
-        app:summary="@string/array_pref_launcher_activator"
-        app:key="applicationNotificationLauncher"
-        app:defaultValue="@string/activator_string"
-        app:ppEntries="@array/launcherArray"
-        app:ppEntryValues="@array/launcherValues"
-        app:layout="@layout/mp_preference_material_widget" />
+<!--    <sk.henrichg.phoneprofilesplus.PPListPreference-->
+<!--        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"-->
+<!--        app:summary="@string/array_pref_launcher_activator"-->
+<!--        app:key="applicationWidgetLauncher"-->
+<!--        app:defaultValue="@string/activator_string"-->
+<!--        app:ppEntries="@array/launcherArray"-->
+<!--        app:ppEntryValues="@array/launcherValues"-->
+<!--        app:layout="@layout/mp_preference_material_widget" />-->
+<!--    <sk.henrichg.phoneprofilesplus.PPListPreference-->
+<!--        app:title="@string/phone_profiles_pref_notificationLauncher"-->
+<!--        app:summary="@string/array_pref_launcher_activator"-->
+<!--        app:key="applicationNotificationLauncher"-->
+<!--        app:defaultValue="@string/activator_string"-->
+<!--        app:ppEntries="@array/launcherArray"-->
+<!--        app:ppEntryValues="@array/launcherValues"-->
+<!--        app:layout="@layout/mp_preference_material_widget" />-->
 
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
         app:key="applicationCreateEditorShortcut"
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_root.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_root.xml
index 9583dbc54c..a5e7253f1c 100644
--- a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_root.xml
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_root.xml
@@ -130,6 +130,12 @@
         app:layout="@layout/mp_preference_material_widget"
         app:fragment="sk.henrichg.phoneprofilesplus.PhoneProfilesPrefsWidgetIcon" />
 
+    <sk.henrichg.phoneprofilesplus.StartActivityPreference
+        app:title="@string/phone_profiles_pref_category_widget_dash_clock"
+        app:key="categoryWidgetDashClockRoot"
+        app:layout="@layout/mp_preference_material_widget"
+        app:fragment="sk.henrichg.phoneprofilesplus.PhoneProfilesPrefsWidgetDashClock" />
+
     <sk.henrichg.phoneprofilesplus.StartActivityPreference
         app:title="@string/phone_profiles_pref_category_shortcut"
         app:key="categoryShortcutRoot"
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_dash_clock.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_dash_clock.xml
new file mode 100644
index 0000000000..265547c6b1
--- /dev/null
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_dash_clock.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:key="categoryWidgetDashClock"
+    app:title="@string/phone_profiles_pref_category_widget_dash_clock">
+
+    <sk.henrichg.phoneprofilesplus.InfoDialogPreference
+        app:key="applicationWidgetDashClockInfo"
+        app:title="@string/phone_profiles_pref_widget_dash_clock_info"
+        app:summary="@string/phone_profiles_pref_widget_dash_clock_info_summary"
+        app:infoText=""
+        app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetDashClockLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_icon.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_icon.xml
index 8e082b7887..03d445f388 100644
--- a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_icon.xml
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_icon.xml
@@ -10,6 +10,15 @@
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetIconLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <sk.henrichg.phoneprofilesplus.PPListPreference
         app:title="@string/phone_profiles_pref_applicationWidgetLayoutHeight"
         app:summary="0"
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_list.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_list.xml
index 73ae9bd7af..c0d14f3acc 100644
--- a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_list.xml
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_list.xml
@@ -9,6 +9,16 @@
         app:title="@string/phone_profiles_pref_widget_not_working_miui_info"
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
+
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetListLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <SwitchPreferenceCompat
         app:key="applicationWidgetListHeader"
         app:title="@string/phone_profiles_pref_applicationHeader"
diff --git a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_one_row.xml b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_one_row.xml
index caecfbfb8e..e4f0fa66a8 100644
--- a/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_one_row.xml
+++ b/phoneProfilesPlus/src/main/res/xml/phone_profiles_prefs_widget_one_row.xml
@@ -10,6 +10,15 @@
         app:summary="@string/phone_profiles_pref_widget_not_working_miui_info_summary"
         app:layout="@layout/mp_preference_material_widget" />
 
+    <sk.henrichg.phoneprofilesplus.PPListPreference
+        app:title="@string/phone_profiles_pref_applicationWidgetLauncher"
+        app:summary="@string/array_pref_launcher_activator"
+        app:key="applicationWidgetOneRowLauncher"
+        app:defaultValue="@string/activator_string"
+        app:ppEntries="@array/launcherArray"
+        app:ppEntryValues="@array/launcherValues"
+        app:layout="@layout/mp_preference_material_widget" />
+
     <sk.henrichg.phoneprofilesplus.PPListPreference
         app:title="@string/phone_profiles_pref_applicationWidgetLayoutHeight"
         app:summary="0"
diff --git a/phoneProfilesPlus/src/main/res/xml/profile_prefs_volumes.xml b/phoneProfilesPlus/src/main/res/xml/profile_prefs_volumes.xml
index 21b2d2bfec..6d430151c5 100644
--- a/phoneProfilesPlus/src/main/res/xml/profile_prefs_volumes.xml
+++ b/phoneProfilesPlus/src/main/res/xml/profile_prefs_volumes.xml
@@ -94,6 +94,11 @@
             app:summary="@string/volume_pref_dialog_no_change_chb"
             app:layout="@layout/mp_preference_material_widget" />
 
+        <sk.henrichg.phoneprofilesplus.InformationPreference
+            app:key="prf_pref_volumeMergedRingSyatemVolumeInfo"
+            app:title="@string/profile_preferences_volumeSystem"
+            app:summary="@string/profile_preferences_volumeMergedRingSyatemVolumeInfo_summary"
+            app:layout="@layout/mp_preference_material_widget" />
         <sk.henrichg.phoneprofilesplus.VolumeDialogPreference
             app:key="prf_pref_volumeSystem"
             app:forVolumesSensor="0"
@@ -102,6 +107,7 @@
             app:title="@string/profile_preferences_volumeSystem"
             app:summary="@string/volume_pref_dialog_no_change_chb"
             app:layout="@layout/mp_preference_material_widget" />
+
         <sk.henrichg.phoneprofilesplus.VolumeDialogPreference
             app:key="prf_pref_volumeVoice"
             app:forVolumesSensor="0"
diff --git a/phoneProfilesPlus/src/main/res/xml/provider_paths.xml b/phoneProfilesPlus/src/main/res/xml/provider_paths.xml
index 34c12c38e5..d99930e020 100644
--- a/phoneProfilesPlus/src/main/res/xml/provider_paths.xml
+++ b/phoneProfilesPlus/src/main/res/xml/provider_paths.xml
@@ -28,4 +28,10 @@
         name="external"
         path="." />
 
+    <external-path
+        name="files_root"
+        path="Android/data/${applicationId}" />
+    <external-path
+        name="external_files"
+        path="." />
 </paths>
\ No newline at end of file
diff --git a/recyclerview-fastscroll/build.gradle b/recyclerview-fastscroll/build.gradle
index 83ef15ccd6..95c958d51e 100644
--- a/recyclerview-fastscroll/build.gradle
+++ b/recyclerview-fastscroll/build.gradle
@@ -31,10 +31,13 @@ dependencies {
 
     implementation "androidx.recyclerview:recyclerview:$ppVersions.recyclerView"
 
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
+
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
 }
 
diff --git a/time-duration-picker/build.gradle b/time-duration-picker/build.gradle
index c3070bc58b..2397ea2098 100644
--- a/time-duration-picker/build.gradle
+++ b/time-duration-picker/build.gradle
@@ -29,12 +29,15 @@ android {
 dependencies {
     //implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    // 1.7.0 compile problem - dependencies
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat:$ppVersions.appcompatXLib"
-    //noinspection GradleDependency
     implementation "androidx.appcompat:appcompat-resources:$ppVersions.appcompatXLib"
 
+    // appcompat 1.7.0 - dependencies problem, this fixed it
+    constraints {
+        //noinspection ForeignDelegate
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ppVersions.kotlinStdlibJdk8")
+    }
+
     implementation project(':common')
 }